Merge remote-tracking branch 'working/user/tsbere/noimage_config' into collab/berick...
authorBill Erickson <berickxx@gmail.com>
Tue, 9 Jun 2015 14:57:07 +0000 (07:57 -0700)
committerBill Erickson <berickxx@gmail.com>
Tue, 9 Jun 2015 14:57:07 +0000 (07:57 -0700)
commit46814cd85c85c7cf83bc3b0577740f516e0398ba
tree45891463462888db032b78e383717fc388bdbc6c
parentd31a43b56fa30f37b1f42dd38c1414e90882a9d3
parent2e65c01284c9055476bbdc9bfb429fca1cc9a820
Merge remote-tracking branch 'working/user/tsbere/noimage_config' into collab/berick/2015-06-09-bug-squashing-combined
Open-ILS/examples/apache/eg_vhost.conf.in
Open-ILS/examples/apache_24/eg_vhost.conf.in