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