Merge branch 'master' of https://github.com/Javafant/diaspora-api to
authorMarek Marecki <triviuss@gmail.com>
Wed, 12 Jun 2013 05:07:50 +0000 (07:07 +0200)
committerMarek Marecki <triviuss@gmail.com>
Wed, 12 Jun 2013 05:07:50 +0000 (07:07 +0200)
be able to push to it


Trivial merge