Merge commit 'micah/master'
[monkeysphere.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 1411 monkeysphere-server.conf
-rw-r--r-- 1397 monkeysphere.conf