Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Tue, 28 Aug 2012 21:33:46 +0000 (17:33 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 28 Aug 2012 21:33:46 +0000 (17:33 -0400)
commitbc0ecaba524dbee6f06d33ae9aa195566772803f
tree2ddf79ab87fdeff721d4ced08b15f76412224ae6
parent152f1951060981cfb2cc813e7c794c4ab6674b69
parent0db316324f6e624b5fe367900e9e96780497739f
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac