From: Dan Scott Date: Wed, 17 Dec 2014 21:03:20 +0000 (-0500) Subject: Merge remote-tracking branch 'remotes/conifer/feature/tpac_nosm_2_7' into rel_2_7_mer... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=98c1ade07689a8ddee08ffc59e34c10407a538a8;p=contrib%2FConifer.git Merge remote-tracking branch 'remotes/conifer/feature/tpac_nosm_2_7' into rel_2_7_mergery_tpac --- 98c1ade07689a8ddee08ffc59e34c10407a538a8