Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 19:09:23 +0000 (15:09 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 19:09:23 +0000 (15:09 -0400)
commit25ff67ed7e58dc8b1092a956f17d5edf111d6c74
tree8945fbeb2e5943c5ca7b1a9961ad038e5dc9b5fc
parentf487402418312226a5a97aa55823ae43c572d097
parenta66e257f791c550a00f3b927c2d34abf34a920e7
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/web/opac/locale/en-US/lang.dtd