Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Thu, 19 Mar 2015 11:16:58 +0000 (07:16 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 19 Mar 2015 11:16:58 +0000 (07:16 -0400)
commit67500e82481871950ee5884a6e2c27aa8d8fc563
treeb1cc732faab3995f5abfc332f8a29a752a083067
parentd692821ce27937013ca78d34c464bd638aebc742
parent378be91d02322231e65daf67cabd4cadad4b3e68
Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac

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