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:53:26 +0000 (14:53 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 7 Aug 2012 18:53:26 +0000 (14:53 -0400)
commitdf752328aaf44063f0d84ab2f08ea08774c939e0
treef5722081339306f90213fb7ae0770f168c695bd5
parentbe42079cc94d0bf43c2bbfd2e53c6d99c5477cf8
parent9e95c136931f4abb499ea2862aed3ee56dc2b758
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery