Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Mon, 24 Feb 2014 16:27:16 +0000 (11:27 -0500)
committerBill Erickson <berick@esilibrary.com>
Mon, 24 Feb 2014 16:27:16 +0000 (11:27 -0500)
commitb7f5fb250be6a0bc0d6048f384ee52002ce62c07
treeeb10f25d6966a0eb5c8f0bf73b5df2a126c6e225
parentf8e45ef3c8656430d78829914a9e5cfb5ab0d866
parente406e36122b07f97f1c6ec6d5397550b03949b1b
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
Open-ILS/examples/apache/eg_vhost.conf.in
Open-ILS/examples/apache_24/eg_vhost.conf.in
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm