From: Dan Scott Date: Wed, 17 Dec 2014 05:03:33 +0000 (-0500) Subject: Merge branch 'rel_2_7_mergery_alt' of git.evergreen-ils.org:contrib/Conifer into... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cd80642681077cbcf204b995dc527a97c2f04943;p=contrib%2FConifer.git Merge branch 'rel_2_7_mergery_alt' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_mergery_tpac --- cd80642681077cbcf204b995dc527a97c2f04943