Merge remote-tracking branch 'working/user/dbs/lp896405_fix_2.2_upgrade-db' into...
authorDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 05:02:55 +0000 (00:02 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 05:02:55 +0000 (00:02 -0500)
commit1acbe39f2c7e65193e783b99a66bf3ebef97ee91
tree4d4fd0fa2402ee720039e64c4ce7e60f74d27539
parentac5e5d021719649f522a1b6b17d01ba22eb07890
parent861fcb5ee657c276aca157c9f70fc79b88b4aa97
Merge remote-tracking branch 'working/user/dbs/lp896405_fix_2.2_upgrade-db' into dbs/master_servant

Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql

Signed-off-by: Dan Scott <dscott@laurentian.ca>