From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 10 Dec 2014 17:34:08 +0000 (-0500)
Subject: Merge branch 'feature/tpac_uhearst_2_7' into rel_2_7_mergery_tpac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bd19b5c7281c3a2c3a439fe2cef0e626edef4fa0;p=contrib%2FConifer.git

Merge branch 'feature/tpac_uhearst_2_7' into rel_2_7_mergery_tpac
---

bd19b5c7281c3a2c3a439fe2cef0e626edef4fa0