From: Dan Scott <dscott@laurentian.ca>
Date: Fri, 2 Dec 2011 05:02:55 +0000 (-0500)
Subject: Merge remote-tracking branch 'working/user/dbs/lp896405_fix_2.2_upgrade-db' into... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1acbe39f2c7e65193e783b99a66bf3ebef97ee91;p=working%2FEvergreen.git

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>
---

1acbe39f2c7e65193e783b99a66bf3ebef97ee91