Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Mon, 13 Aug 2012 21:43:08 +0000 (17:43 -0400)
committerDan Scott <dscott@laurentian.ca>
Mon, 13 Aug 2012 21:43:08 +0000 (17:43 -0400)
commitd3e603cb96bdd33f6d5a39c00d6bf0786891afc1
treef23e26f4cc9e860ba3cd58ed5d5cb3147343f21b
parent364fa22b7c5e4d7e8f3f3a9072fc8bc40350ae91
parentccc1632b427ca832410ca87ad692e82c7b91de68
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_osul