From: Dan Scott <dscott@laurentian.ca>
Date: Sat, 14 Mar 2015 22:34:30 +0000 (-0400)
Subject: Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d7ab3ac8c34a789114fc0ea15b7bd5e38997e019;p=contrib%2FConifer.git

Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac

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

Conflicts:
	Open-ILS/src/templates/opac/parts/misc_util.tt2
	Open-ILS/src/templates/opac/parts/record/body.tt2
---

d7ab3ac8c34a789114fc0ea15b7bd5e38997e019