Merge branch 'streams' of https://github.com/Javafant/diaspora-api into streams
authorMarek Marecki <triviuss@gmail.com>
Fri, 3 May 2013 10:19:52 +0000 (12:19 +0200)
committerMarek Marecki <triviuss@gmail.com>
Fri, 3 May 2013 10:19:52 +0000 (12:19 +0200)
commit4c0ebeafe6bdc25b95fa5f19e7368f7d2ac021db
treeda239b23ad442de52d10c053cf752d8ee9839deb
parentdc17be88bd77f1026cfc0f2f6597d627e2010275
parent59ad210c71397fadc63ec27968597a4e9b5b4a52
Merge branch 'streams' of https://github.com/Javafant/diaspora-api into streams

Conflicts:
diaspy/streams.py
diaspy/streams.py