Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorBill Erickson <berick@esilibrary.com>
Mon, 13 Jun 2011 17:47:14 +0000 (13:47 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 13 Jun 2011 17:47:14 +0000 (13:47 -0400)
commit038ceea87d63251b785fc1fb0ee5e84944206ce9
treeccc48b0e34c86e2d22acf6295a2bf3b7c5091eab
parentf399b10497ab8b2df6f7ee6acd6de8476bf6d4d2
parent0b36655676ecc802fcb822e385dc87206c0a0e00
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/030.schema.metabib.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/src/sql/Pg/990.schema.unapi.sql
Open-ILS/web/opac/locale/en-US/lang.dtd