From: Dan Scott Date: Sat, 17 Jan 2015 15:35:29 +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=512b1c643f4d70f72605b99d2ddf57a3284b05f9;p=contrib%2FConifer.git Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac --- 512b1c643f4d70f72605b99d2ddf57a3284b05f9