Merge remote-tracking branch 'origin/rel_2_7_1_kpac' into rel_2_7_2
authorChris Sharp <csharp@georgialibraries.org>
Mon, 5 Jan 2015 18:56:23 +0000 (13:56 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Mon, 5 Jan 2015 18:56:23 +0000 (13:56 -0500)
commit83dab26cc5c5ef72aa15a29ea7982697e410df5e
tree10d71ca7e0f5204d6ef857fc639f3635443955fe
parent85d5d21d55fa69de36af961e4360738fae5788c9
parent9f64da6a9d54cb0a207f767634f04887bbddae80
Merge remote-tracking branch 'origin/rel_2_7_1_kpac' into rel_2_7_2

Conflicts:
ChangeLog
Open-ILS/examples/kpac.xml
Open-ILS/src/perlmods/lib/OpenILS.pm
Open-ILS/src/perlmods/lib/OpenILS/Application.pm
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql
Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.5.0-upgrade-db.sql
Open-ILS/src/templates/kpac/getit.tt2
Open-ILS/src/templates/kpac/homedewey.tt2
Open-ILS/src/templates/kpac/parts/copy_table.tt2
Open-ILS/src/templates/kpac/parts/header.tt2
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/src/templates/opac/parts/config.tt2
Open-ILS/src/templates/opac/parts/footer.tt2
Open-ILS/src/templates/opac/parts/header.tt2
Open-ILS/src/templates/opac/parts/record/authors.tt2
Open-ILS/src/templates/opac/parts/record/awards.tt2
Open-ILS/src/templates/opac/parts/record/copy_table.tt2
Open-ILS/src/templates/opac/parts/record/series.tt2
Open-ILS/src/templates/opac/parts/record/subjects.tt2
Open-ILS/src/templates/opac/parts/result/table.tt2
Open-ILS/src/templates/opac/parts/searchbar.tt2
Open-ILS/src/templates/opac/parts/topnav_links.tt2
Open-ILS/src/templates/opac/results.tt2
Open-ILS/web/css/skin/default/kpac/style.css
Open-ILS/web/js/ui/default/opac/staff.js
Open-ILS/xul/staff_client/chrome/content/main/about.html
Open-ILS/xul/staff_client/defaults/preferences/prefs.js
Open-ILS/xul/staff_client/server/cat/marcedit.js
Open-ILS/xul/staff_client/windowssetup.nsi
README
build/tools/make_release
configure.ac
docs/installation/server_installation.txt
docs/root.txt
Open-ILS/examples/kpac.xml
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
Open-ILS/src/templates/kpac/homedewey.tt2
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/src/templates/opac/parts/config.tt2
Open-ILS/src/templates/opac/parts/footer.tt2
Open-ILS/src/templates/opac/parts/record/awards.tt2