Merge branch 'user/dbs/rel_2_3_mergery_tpac' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Tue, 28 Aug 2012 21:40:01 +0000 (17:40 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 28 Aug 2012 21:40:01 +0000 (17:40 -0400)
commit29caa7999fccbd8bc79dec47d386bda4ffc4f558
treeec3ae31fea4850866a56b3874b69ddeae7449dee
parentbc0ecaba524dbee6f06d33ae9aa195566772803f
parentb5585ca02889a792258bbfbc0c92215f7e30ffcf
Merge branch 'user/dbs/rel_2_3_mergery_tpac' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac