Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 20:23:05 +0000 (16:23 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 20:23:05 +0000 (16:23 -0400)
commit5c30a22a7199ef412bc202ba9b8238c7c5b528b0
tree2f4549286fd814b9a5f74aaf909320416bd66659
parentff4dce783c2adf138e6abdd75c985fab95e4812f
parent4c21518b658e7c56b819acb78b626a239a13ca24
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/web/opac/locale/en-US/lang.dtd