From: Dan Scott Date: Fri, 26 Dec 2014 13:46:32 +0000 (-0500) Subject: Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e3e6c02a8935b228dc0ceb4f3f914179b94db604;p=contrib%2FConifer.git Merge branch 'rel_2_7_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_7_mergery_tpac --- e3e6c02a8935b228dc0ceb4f3f914179b94db604