Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into working_branch working_branch
authorJoseph Lewis <joehms22@gmail.com>
Tue, 26 Jul 2011 16:55:11 +0000 (10:55 -0600)
committerJoseph Lewis <joehms22@gmail.com>
Tue, 26 Jul 2011 16:55:11 +0000 (10:55 -0600)
commitdf676ede756b8be92eacdb639682cfc02e030bba
tree2b27a25339dec5a3b64cedab41332b1818b89f31
parentc710049eaf13aa419d1932cc1198e8ca96e8805f
parent0e3052e2ad5b862e146e297e756fbc58f035b639
Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into working_branch
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/005.schema.actors.sql
Open-ILS/src/sql/Pg/800.fkeys.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/web/opac/locale/en-US/lang.dtd