Merge branch 'streams' of https://github.com/Javafant/diaspora-api into streams
authorMarek Marecki <triviuss@gmail.com>
Fri, 3 May 2013 12:03:42 +0000 (14:03 +0200)
committerMarek Marecki <triviuss@gmail.com>
Fri, 3 May 2013 12:03:42 +0000 (14:03 +0200)

Trivial merge