From: Dan Scott <dscott@laurentian.ca>
Date: Thu, 19 Mar 2015 11:16:58 +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=67500e82481871950ee5884a6e2c27aa8d8fc563;p=contrib%2FConifer.git

Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac

Conflicts:
	Open-ILS/src/templates/marc/OSUL_Journal_Electronic.xml
---

67500e82481871950ee5884a6e2c27aa8d8fc563