Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...

author Mike Rylander <mrylander@gmail.com>

Thu, 10 Mar 2011 19:20:30 +0000 (14:20 -0500)

committer Mike Rylander <mrylander@gmail.com>

Thu, 10 Mar 2011 19:20:30 +0000 (14:20 -0500)
author Mike Rylander <mrylander@gmail.com>
Thu, 10 Mar 2011 19:20:30 +0000 (14:20 -0500)
committer Mike Rylander <mrylander@gmail.com>
Thu, 10 Mar 2011 19:20:30 +0000 (14:20 -0500)
diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge
diff --cc Open-ILS/web/opac/locale/en-US/lang.dtd
Simple merge
author	Mike Rylander <mrylander@gmail.com>
	Thu, 10 Mar 2011 19:20:30 +0000 (14:20 -0500)
committer	Mike Rylander <mrylander@gmail.com>
	Thu, 10 Mar 2011 19:20:30 +0000 (14:20 -0500)
		1	2
Open-ILS/src/sql/Pg/950.data.seed-values.sql	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/opac/locale/en-US/lang.dtd	patch \|	diff1 \|	diff2 \|	blob \| history