Merge branch 'master' of webmaster@george.riseup.net:monkeysphere
[monkeysphere.git] / etc /
drwxr-xr-x   ..
-rw-r--r-- 1316 monkeysphere-server.conf
-rw-r--r-- 1295 monkeysphere.conf