From: Mike Rylander Date: Thu, 29 Dec 2011 17:15:25 +0000 (-0500) Subject: Merge remote-tracking branch 'eg-working/user/dbs/lp894052-version-upgrade' X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=21adee5d2d4ad32cfd299edf72e3d70ec1428939;p=evergreen%2Fmasslnc.git Merge remote-tracking branch 'eg-working/user/dbs/lp894052-version-upgrade' One merge conflict in 2.0-2.1-upgrade-db.sql silenced with -X theirs. See LP#894052 for details. Signed-off-by: Mike Rylander --- 21adee5d2d4ad32cfd299edf72e3d70ec1428939