Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
authorDan Scott <dscott@laurentian.ca>
Tue, 7 Aug 2012 18:32:34 +0000 (14:32 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 7 Aug 2012 18:32:34 +0000 (14:32 -0400)
commitbe42079cc94d0bf43c2bbfd2e53c6d99c5477cf8
treeae2510a952cc58b71eb21a46da3cb1d154b63ecb
parentb02020236e4c08c732a6ea4bf00b31c563189b31
parent6702825122afae72f531bd81d3018be41b71edb9
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery