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

author Mike Rylander <mrylander@gmail.com>

Mon, 7 Mar 2011 16:06:13 +0000 (11:06 -0500)

committer Mike Rylander <mrylander@gmail.com>

Mon, 7 Mar 2011 16:06:13 +0000 (11:06 -0500)
author Mike Rylander <mrylander@gmail.com>
Mon, 7 Mar 2011 16:06:13 +0000 (11:06 -0500)
committer Mike Rylander <mrylander@gmail.com>
Mon, 7 Mar 2011 16:06:13 +0000 (11:06 -0500)
diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge
author	Mike Rylander <mrylander@gmail.com>
	Mon, 7 Mar 2011 16:06:13 +0000 (11:06 -0500)
committer	Mike Rylander <mrylander@gmail.com>
	Mon, 7 Mar 2011 16:06:13 +0000 (11:06 -0500)
		1	2
Open-ILS/examples/fm_IDL.xml	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	patch \|	diff1 \|	diff2 \|	blob \| history