From: Chris Sharp <csharp@georgialibraries.org>
Date: Tue, 12 Nov 2013 18:44:50 +0000 (-0500)
Subject: Merge branch 'rel_2_5_rc1' into 2_5_0_merge_test
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8a274387ee6e36857f0aeeaac6a721ba86afe870;p=evergreen%2Fpines.git

Merge branch 'rel_2_5_rc1' into 2_5_0_merge_test

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
	configure.ac
	docs/RELEASE_NOTES_2_5.txt
---

8a274387ee6e36857f0aeeaac6a721ba86afe870