Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 05:02:21 +0000 (00:02 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 05:02:21 +0000 (00:02 -0500)
commit08bc519d3cb6e5a3c73fd5580329894014c5eb35
tree367d382346dadfc163fe3aa457f43930963c3b8b
parent2ede1d169af4978c97e1d62a7b9c59958e6aca34
parent66e56a7cb7c005382cdc512b7fa3b3fe0ee57b95
Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/src/templates/opac/parts/record/summary.tt2
Open-ILS/src/extras/install/Makefile.ubuntu-precise
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Open-ILS/src/templates/opac/parts/record/summary.tt2