Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Thu, 9 Aug 2012 15:10:40 +0000 (11:10 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 9 Aug 2012 15:10:40 +0000 (11:10 -0400)

Trivial merge