Merge commit 'jrollins/master'
[monkeysphere.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 817 monkeysphere-server.conf
-rw-r--r-- 768 monkeysphere.conf