Merge commit 'micah/master'
[monkeysphere.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 1365 monkeysphere-authentication.conf
-rw-r--r-- 500 monkeysphere-host.conf
-rw-r--r-- 1412 monkeysphere.conf