Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer...
authorDan Scott <dscott@laurentian.ca>
Wed, 12 Sep 2012 17:08:00 +0000 (13:08 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 12 Sep 2012 17:08:00 +0000 (13:08 -0400)
commit026872dffe13260b51c7ebe8e2e49ea2808c51a8
tree5f72fde5cf8487c3f18c30c772cdf73bb761eb1f
parent79b5719694b474270f0f68fa503dcfb184b62355
parent5a1c5a95d8f88693cf52fddf63de6bf2c46d2508
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac