Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/phasefx/sms_msgs
authorBill Erickson <berick@esilibrary.com>
Mon, 9 Jan 2012 15:39:56 +0000 (10:39 -0500)
committerBill Erickson <berick@esilibrary.com>
Mon, 9 Jan 2012 15:39:56 +0000 (10:39 -0500)
commitcb7126037c590809673faea2eb43328fecfecfc6
tree026dc174d6a30acfda2ddfd63d351255875a31a6
parent314652b0de502a438f05ae32a5946d9c1bce7412
parent922c9def9f04aa8855f34e14d5fd5f93ee3b1a54
Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/phasefx/sms_msgs
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/090.schema.action.sql
Open-ILS/web/opac/locale/en-US/lang.dtd