From: Dan Scott Date: Sun, 7 Dec 2014 12:24:00 +0000 (-0500) Subject: Merge remote-tracking branch 'remotes/conifer/feature/tpac_eresources_highlander_2_7... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=04977a5782c7c493591c5debe7cbdea525e42aa7;p=contrib%2FConifer.git Merge remote-tracking branch 'remotes/conifer/feature/tpac_eresources_highlander_2_7' into mergery_2_7 --- 04977a5782c7c493591c5debe7cbdea525e42aa7