Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere
-rw-r--r-- 162 .gitignore
-rw-r--r-- 35963 COPYING
-rwxr-xr-x 3022 Makefile
lrwxrwxrwx 26 changelog -> packaging/debian/changelog
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - man
drwxr-xr-x - packaging
drwxr-xr-x - patches
drwxr-xr-x - repo
drwxr-xr-x - src
drwxr-xr-x - tests
drwxr-xr-x - utils
drwxr-xr-x - website