Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorBill Erickson <berick@esilibrary.com>
Wed, 29 Jun 2011 21:17:38 +0000 (17:17 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 29 Jun 2011 21:17:38 +0000 (17:17 -0400)
commit0ea64170f1d07a39e448226f9a986220c5973cf3
tree4e9f9ccb7c98eab2d1d94839471c6f683f894afa
parent960f69d43b34b5cd47237439e431022c07e26fc9
parent08c539bc8cad0cd19f109ccd6be411b0335dff65
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/990.schema.unapi.sql
Open-ILS/src/sql/Pg/999.functions.global.sql
Open-ILS/web/opac/locale/en-US/lang.dtd