Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Thu, 30 Aug 2012 17:09:53 +0000 (13:09 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 30 Aug 2012 17:09:53 +0000 (13:09 -0400)
commit28d734dee2d768540306dbdf0398110cfecb72fa
tree1f99733a061882dec4af81db072853a9a06991be
parent61b3c24fd0ed0f23c017231500969e29b8f47923
parent0b609dfad7a386bd90e756eefe4082673a14fdb5
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac