Merge commit 'jrollins/master' monkeysphere_0.3-1
[monkeysphere.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 1068 monkeysphere-server.conf
-rw-r--r-- 917 monkeysphere.conf