Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...

author Mike Rylander <mrylander@gmail.com>

Wed, 23 Feb 2011 22:05:13 +0000 (17:05 -0500)

committer Mike Rylander <mrylander@gmail.com>

Wed, 23 Feb 2011 22:05:13 +0000 (17:05 -0500)
author Mike Rylander <mrylander@gmail.com>
Wed, 23 Feb 2011 22:05:13 +0000 (17:05 -0500)
committer Mike Rylander <mrylander@gmail.com>
Wed, 23 Feb 2011 22:05:13 +0000 (17:05 -0500)
diff --cc Open-ILS/src/sql/Pg/002.schema.config.sql
Simple merge
diff --cc Open-ILS/src/sql/Pg/040.schema.asset.sql
Simple merge
author	Mike Rylander <mrylander@gmail.com>
	Wed, 23 Feb 2011 22:05:13 +0000 (17:05 -0500)
committer	Mike Rylander <mrylander@gmail.com>
	Wed, 23 Feb 2011 22:05:13 +0000 (17:05 -0500)
		1	2
Open-ILS/src/sql/Pg/002.schema.config.sql	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/040.schema.asset.sql	patch \|	diff1 \|	diff2 \|	blob \| history