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

author Mike Rylander <mrylander@gmail.com>

Mon, 14 Mar 2011 16:33:30 +0000 (12:33 -0400)

committer Mike Rylander <mrylander@gmail.com>

Mon, 14 Mar 2011 16:33:30 +0000 (12:33 -0400)
author Mike Rylander <mrylander@gmail.com>
Mon, 14 Mar 2011 16:33:30 +0000 (12:33 -0400)
committer Mike Rylander <mrylander@gmail.com>
Mon, 14 Mar 2011 16:33:30 +0000 (12:33 -0400)
diff --cc Open-ILS/src/sql/Pg/990.schema.unapi.sql
Simple merge
diff --cc Open-ILS/web/opac/locale/en-US/lang.dtd
Simple merge
author	Mike Rylander <mrylander@gmail.com>
	Mon, 14 Mar 2011 16:33:30 +0000 (12:33 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Mon, 14 Mar 2011 16:33:30 +0000 (12:33 -0400)
		1	2
Open-ILS/src/sql/Pg/990.schema.unapi.sql	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/opac/locale/en-US/lang.dtd	patch \|	diff1 \|	diff2 \|	blob \| history