Merge branch 'user/dbs/avoid_2.1_upgrade_pain' into dbs/master_servant
authorDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 04:59:56 +0000 (23:59 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 05:00:10 +0000 (00:00 -0500)
commit3dbaf8b499a8ab40e586e39629e87f07b031a35b
tree352d0143ee9bc7f259354f19d5adefba388a3edf
parent334a91327e6dae8f95c50e3e99391ce0a241a835
parent87985df97f6a1eea90a93a02777790254cccd11a
Merge branch 'user/dbs/avoid_2.1_upgrade_pain' into dbs/master_servant

Conflicts:
Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql