From: Dan Scott <dscott@laurentian.ca>
Date: Sun, 11 Jan 2015 03:27:39 +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=1b63919f3cda0084f68b255aa4290353eaa25101;p=contrib%2FConifer.git

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

1b63919f3cda0084f68b255aa4290353eaa25101