Merge branch 'master' into template-toolkit-opac

author Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

Wed, 10 Aug 2011 14:36:27 +0000 (10:36 -0400)

committer Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

Wed, 10 Aug 2011 14:36:27 +0000 (10:36 -0400)
author Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Wed, 10 Aug 2011 14:36:27 +0000 (10:36 -0400)
committer Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Wed, 10 Aug 2011 14:36:27 +0000 (10:36 -0400)
diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge
author	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Wed, 10 Aug 2011 14:36:27 +0000 (10:36 -0400)
committer	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Wed, 10 Aug 2011 14:36:27 +0000 (10:36 -0400)