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)
Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql

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

Trivial merge