Merged trunk in from 17245:17645

[sfa.git] / sfa / server / modpython / sfa.slicemgr.httpd.conf

diff --git a/sfa/server/sfa.slicemgr.httpd.conf b/sfa/server/modpython/sfa.slicemgr.httpd.conf
similarity index 100%
rename from sfa/server/sfa.slicemgr.httpd.conf
rename to sfa/server/modpython/sfa.slicemgr.httpd.conf