From: Dan Scott <dscott@laurentian.ca>
Date: Sat, 17 Jan 2015 15:45:32 +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=25bdc0cceb08687a81db7fbf09e01b600148931e;p=contrib%2FConifer.git

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

25bdc0cceb08687a81db7fbf09e01b600148931e