From: Dan Scott <dscott@laurentian.ca>
Date: Tue, 17 Nov 2015 17:13:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/rel_2_7_mergery' into HEAD
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1120a1f018628901bfffdb18d1fbd829c9a4cd52;p=contrib%2FConifer.git

Merge remote-tracking branch 'origin/rel_2_7_mergery' into HEAD
---

1120a1f018628901bfffdb18d1fbd829c9a4cd52