From: Dan Scott <dscott@laurentian.ca>
Date: Sat, 17 Jan 2015 15:47:43 +0000 (-0500)
Subject: Merge branch 'feature/tpac_conifer_2_7' into rel_2_7_mergery_tpac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5d6df8b2413a70138637541c83ecf22ef063ba18;p=contrib%2FConifer.git

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

5d6df8b2413a70138637541c83ecf22ef063ba18