Merge branch 'rel_2_7_mergery_alt' of git.evergreen-ils.org:contrib/Conifer into...
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 05:03:33 +0000 (00:03 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 05:03:33 +0000 (00:03 -0500)
commitcd80642681077cbcf204b995dc527a97c2f04943
treef09474ff0be9868d88de075121f0b2fc4a2e1674
parenteff4e875e2fe5e62cd18bccd64c9dbeda063013e
parent536978291155df110893e8ef089b3a1f354e9625
Merge branch 'rel_2_7_mergery_alt' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_mergery_tpac