Merge branch 'streams' of git://github.com/marekjm/diaspora-api into streams
-rw-r--r-- 87 .gitignore
-rw-r--r-- 1083 LICENSE
-rw-r--r-- 216 Makefile
-rw-r--r-- 1151 README.md
drwxr-xr-x - diaspy
drwxr-xr-x - docs
drwxr-xr-x - manual
-rw-r--r-- 23 requirements.txt
-rw-r--r-- 359 setup.py
-rw-r--r-- 10738 test-image.png
-rwxr-xr-x 74 test.sh
-rw-r--r-- 427 testconf.md
-rw-r--r-- 4757 tests.py
-rw-r--r-- 46 tox.ini