Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets

author Mike Rylander <mrylander@gmail.com>

Fri, 3 Jun 2011 13:54:32 +0000 (09:54 -0400)

committer Mike Rylander <mrylander@gmail.com>

Fri, 3 Jun 2011 13:54:32 +0000 (09:54 -0400)
author Mike Rylander <mrylander@gmail.com>
Fri, 3 Jun 2011 13:54:32 +0000 (09:54 -0400)
committer Mike Rylander <mrylander@gmail.com>
Fri, 3 Jun 2011 13:54:32 +0000 (09:54 -0400)
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>
	Fri, 3 Jun 2011 13:54:32 +0000 (09:54 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Fri, 3 Jun 2011 13:54:32 +0000 (09:54 -0400)
		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