Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into working_branch

author Joseph Lewis <joehms22@gmail.com>

Mon, 13 Jun 2011 22:55:40 +0000 (16:55 -0600)

committer Joseph Lewis <joehms22@gmail.com>

Mon, 13 Jun 2011 22:55:40 +0000 (16:55 -0600)
author Joseph Lewis <joehms22@gmail.com>
Mon, 13 Jun 2011 22:55:40 +0000 (16:55 -0600)
committer Joseph Lewis <joehms22@gmail.com>
Mon, 13 Jun 2011 22:55:40 +0000 (16:55 -0600)
diff --cc Open-ILS/src/sql/Pg/002.schema.config.sql
Simple merge
diff --cc Open-ILS/web/opac/locale/en-US/lang.dtd
Simple merge
author	Joseph Lewis <joehms22@gmail.com>
	Mon, 13 Jun 2011 22:55:40 +0000 (16:55 -0600)
committer	Joseph Lewis <joehms22@gmail.com>
	Mon, 13 Jun 2011 22:55:40 +0000 (16:55 -0600)
		1	2
Open-ILS/src/sql/Pg/002.schema.config.sql	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/opac/locale/en-US/lang.dtd	patch \|	diff1 \|	diff2 \|	blob \| history