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

Trivial merge