Merge branch 'rel_2_4_mergery_tpac' of git.evergreen-ils.org:contrib/Conifer into...
authorDan Scott <dscott@laurentian.ca>
Mon, 7 Jul 2014 17:45:33 +0000 (13:45 -0400)
committerDan Scott <dscott@laurentian.ca>
Mon, 7 Jul 2014 17:45:33 +0000 (13:45 -0400)
commit6967ed0f7945f1d7dd057ba56c8ee5b77c79bb27
tree2d17cdb982c960e4aa0d37540e1f2c1ecf8d0147
parent9dd6380469034eee5d55f3f0e6edc6f0388fbabe
parenta26d19abd8a70446bd529d4fd1fc24c119d2728b
Merge branch 'rel_2_4_mergery_tpac' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac