From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 12 Jul 2017 20:22:34 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/rel_2_10' into HEAD
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3a3aded5b5c1a7f8b20774d2660768120f0bb14d;p=contrib%2FConifer.git

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

3a3aded5b5c1a7f8b20774d2660768120f0bb14d