Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 28 Jun 2011 15:27:10 +0000 (11:27 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 28 Jun 2011 15:27:10 +0000 (11:27 -0400)
commitd99c84dbc53c757a8921553bb2a7f5d97e856e19
treeecf0ca20438215dc302f5282a9e174bb8caeac5b
parent4b15178f15a01669beecb8d0708c1bf540f1555e
parent08b13c6648eb9316baaeb84c5b2bfcaa39e2f72a
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
Open-ILS/src/sql/Pg/999.functions.global.sql
Open-ILS/web/opac/locale/en-US/lang.dtd