Merge branch 'rel_2_5_beta1' into rel_2_5_rc1 rel_2_5_rc1
authorChris Sharp <csharp@georgialibraries.org>
Thu, 17 Oct 2013 20:02:14 +0000 (16:02 -0400)
committerChris Sharp <csharp@georgialibraries.org>
Thu, 17 Oct 2013 20:02:14 +0000 (16:02 -0400)
commitc1f518005bc50a4cdab21cd523b73e84280656cf
treee9a0dfd929f314639270e3b55e2c5f2e3fcb6771
parent40905ae91c1bdeee72fb30bb676d116b3e96493d
parent228cf770f32105ce2bef648cdf8cb25ecd29fb5c
Merge branch 'rel_2_5_beta1' into rel_2_5_rc1

Conflicts:
ChangeLog
Open-ILS/src/perlmods/lib/OpenILS/Application.pm
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/xul/staff_client/chrome/content/main/about.html
Open-ILS/xul/staff_client/defaults/preferences/prefs.js
README
build/tools/make_release
configure.ac
docs/RELEASE_NOTES_2_5.txt
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/xul/staff_client/chrome/content/util/print.js
build/tools/make_release
docs/RELEASE_NOTES_2_5.txt