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)

Trivial merge