Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into working_branch
authorJoseph Lewis <joehms22@gmail.com>
Thu, 7 Jul 2011 21:02:11 +0000 (15:02 -0600)
committerJoseph Lewis <joehms22@gmail.com>
Thu, 7 Jul 2011 21:02:11 +0000 (15:02 -0600)
commitab2924f9137b31f3ddd7ea35d1ef26491cea1ab9
tree11adde0fa95f34ab6820da6fe8c6c6788ced05b6
parentbb8c579383748436c242a254f59afbfe2d814a6e
parentdf467c8cd0feeee08ce401544e60453899aa4ed7
Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into working_branch

Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/002.schema.config.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