Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Tue, 18 Jun 2013 17:03:47 +0000 (13:03 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 18 Jun 2013 17:03:47 +0000 (13:03 -0400)
commit1951fbca30168ccc847b82f04f680e34584108d2
tree7fbcc381449b91e6cb8aae61f232b460eac4e28e
parent35acb466f24ee60e70a743e15a8b0f1a7c712b4b
parentb1512f4be91841aedc958de9a76c877f70f352ce
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac