Merge branch 'master' of git.evergreen-ils.org:Evergreen

diff --git a/Open-ILS/src/sql/Pg/2.0-2.1.sql b/Open-ILS/src/sql/Pg/2.0-2.1-upgrade-db.sql
similarity index 100%
rename from Open-ILS/src/sql/Pg/2.0-2.1.sql
rename to Open-ILS/src/sql/Pg/2.0-2.1-upgrade-db.sql