Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
[monkeysphere.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 1196 monkeysphere-server.conf
-rw-r--r-- 857 monkeysphere.conf