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

author Mike Rylander <mrylander@gmail.com>

Tue, 1 Mar 2011 20:51:46 +0000 (15:51 -0500)

committer Mike Rylander <mrylander@gmail.com>

Tue, 1 Mar 2011 20:51:46 +0000 (15:51 -0500)
author Mike Rylander <mrylander@gmail.com>
Tue, 1 Mar 2011 20:51:46 +0000 (15:51 -0500)
committer Mike Rylander <mrylander@gmail.com>
Tue, 1 Mar 2011 20:51:46 +0000 (15:51 -0500)
diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
Simple merge
diff --cc Open-ILS/src/sql/Pg/040.schema.asset.sql
Simple merge
author	Mike Rylander <mrylander@gmail.com>
	Tue, 1 Mar 2011 20:51:46 +0000 (15:51 -0500)
committer	Mike Rylander <mrylander@gmail.com>
	Tue, 1 Mar 2011 20:51:46 +0000 (15:51 -0500)
		1	2
Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/040.schema.asset.sql	patch \|	diff1 \|	diff2 \|	blob \| history