Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_...
authorDan Scott <dscott@laurentian.ca>
Thu, 28 Aug 2014 16:01:03 +0000 (12:01 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 28 Aug 2014 16:01:03 +0000 (12:01 -0400)
commit4bc948e1cc444d1d8b786f3924bc986f73940e99
treedfcad09e48790bfd2dc079119fad0c0440337231
parent0c1eb1caba6bbb2c7626646e96391d1d27c6196b
parent770f5ac44943d4dcfb0dc0390fd64adac9a73b68
Merge branch 'rel_2_4_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_4_mergery_tpac