Merge branch 'rel_2_4' of git.evergreen-ils.org:Evergreen into user/dbs/tpac_osul_2_4
authorDan Scott <dscott@laurentian.ca>
Wed, 19 Jun 2013 15:40:16 +0000 (11:40 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 19 Jun 2013 15:40:16 +0000 (11:40 -0400)

Trivial merge