Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Tue, 4 Jun 2013 17:50:36 +0000 (13:50 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 4 Jun 2013 17:50:36 +0000 (13:50 -0400)

Trivial merge