Merge commit 'dkg/master'
[monkeysphere.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 1837 monkeysphere-server.conf
-rw-r--r-- 1222 monkeysphere.conf