Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets

author Mike Rylander <mrylander@gmail.com>

Tue, 28 Jun 2011 15:27:10 +0000 (11:27 -0400)

committer Mike Rylander <mrylander@gmail.com>

Tue, 28 Jun 2011 15:27:10 +0000 (11:27 -0400)
author Mike Rylander <mrylander@gmail.com>
Tue, 28 Jun 2011 15:27:10 +0000 (11:27 -0400)
committer Mike Rylander <mrylander@gmail.com>
Tue, 28 Jun 2011 15:27:10 +0000 (11:27 -0400)
diff --cc Open-ILS/src/sql/Pg/999.functions.global.sql
Simple merge
diff --cc Open-ILS/web/opac/locale/en-US/lang.dtd
Simple merge
author	Mike Rylander <mrylander@gmail.com>
	Tue, 28 Jun 2011 15:27:10 +0000 (11:27 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Tue, 28 Jun 2011 15:27:10 +0000 (11:27 -0400)
		1	2
Open-ILS/src/sql/Pg/999.functions.global.sql	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/opac/locale/en-US/lang.dtd	patch \|	diff1 \|	diff2 \|	blob \| history