Merge remote-tracking branch 'bogomips/resurrect-device' into testing
[MogileFS-Server.git] / conf / 
treed1fddae84d53d807f93d9556d84d9173305470b2
drwxr-xr-x   ..
-rw-r--r-- 1463 mogilefsd.conf
-rw-r--r-- 92 mogstored.conf