Merge branch 'tags/rel_2_7_2' of git://git.evergreen-ils.org/Evergreen into rel_2_7_2
authorChris Sharp <csharp@georgialibraries.org>
Mon, 5 Jan 2015 18:21:12 +0000 (13:21 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Mon, 5 Jan 2015 18:21:12 +0000 (13:21 -0500)
commit85d5d21d55fa69de36af961e4360738fae5788c9
tree48f2bc453075dc77a9824d4ce81c44698a051d9b
parent5aad4e74897dff1c495de03c50024adff058073b
parent829da0d4f0a929d48f10f7075581b56d36c199cc
Merge branch 'tags/rel_2_7_2' of git://git.evergreen-ils.org/Evergreen into rel_2_7_2

Conflicts:
ChangeLog
Open-ILS/src/perlmods/lib/OpenILS/Application.pm
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/version-upgrade/2.7.0-2.7.1-upgrade-db.sql
Open-ILS/xul/staff_client/chrome/content/main/about.html
Open-ILS/xul/staff_client/defaults/preferences/prefs.js
README
configure.ac