Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into action_trigger_cl...

author Steven Callender <stevecallender@esilibrary.com>

Thu, 25 Aug 2011 14:27:13 +0000 (14:27 +0000)

committer Steven Callender <stevecallender@esilibrary.com>

Thu, 25 Aug 2011 14:27:13 +0000 (14:27 +0000)
author Steven Callender <stevecallender@esilibrary.com>
Thu, 25 Aug 2011 14:27:13 +0000 (14:27 +0000)
committer Steven Callender <stevecallender@esilibrary.com>
Thu, 25 Aug 2011 14:27:13 +0000 (14:27 +0000)
diff --cc Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql
Simple merge
diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge
author	Steven Callender <stevecallender@esilibrary.com>
	Thu, 25 Aug 2011 14:27:13 +0000 (14:27 +0000)
committer	Steven Callender <stevecallender@esilibrary.com>
	Thu, 25 Aug 2011 14:27:13 +0000 (14:27 +0000)
		1	2
Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	patch \|	diff1 \|	diff2 \|	blob \| history