From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 15 Aug 2012 15:15:49 +0000 (-0400)
Subject: Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3e941e75c1df46d42cc4fe36e429efb7993b28bc;p=contrib%2FConifer.git

Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery

Conflicts:
	Open-ILS/src/templates/opac/parts/advanced/search.tt2
	Open-ILS/src/templates/opac/parts/org_selector.tt2

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

3e941e75c1df46d42cc4fe36e429efb7993b28bc