From: Dan Scott <dscott@laurentian.ca>
Date: Tue, 2 Oct 2012 20:52:03 +0000 (-0400)
Subject: Merge branch 'rel_2_3_mergery' into rel_2_3_mergery_tpac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0809d8180a86f1513bc48835169d235b10835240;p=contrib%2FConifer.git

Merge branch 'rel_2_3_mergery' into rel_2_3_mergery_tpac
---

0809d8180a86f1513bc48835169d235b10835240