From: Dan Scott Date: Fri, 16 Jan 2015 20:21:33 +0000 (-0500) Subject: Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e87d89f7ec7dfb8fe848ccdf960445e252793af3;p=contrib%2FConifer.git Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac --- e87d89f7ec7dfb8fe848ccdf960445e252793af3