Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

author Bill Erickson <berick@esilibrary.com>

Thu, 25 Aug 2011 20:03:27 +0000 (16:03 -0400)

committer Bill Erickson <berick@esilibrary.com>

Thu, 25 Aug 2011 20:03:27 +0000 (16:03 -0400)
author Bill Erickson <berick@esilibrary.com>
Thu, 25 Aug 2011 20:03:27 +0000 (16:03 -0400)
committer Bill Erickson <berick@esilibrary.com>
Thu, 25 Aug 2011 20:03:27 +0000 (16:03 -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	Bill Erickson <berick@esilibrary.com>
	Thu, 25 Aug 2011 20:03:27 +0000 (16:03 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Thu, 25 Aug 2011 20:03:27 +0000 (16:03 -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