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)
commit54aa5ef99a7ae23544a3a840616bdeffb4837636
treec81fe85931c534ea36263df7876fe27515669fde
parent37219a63d1898ba4c6535f1970ebdb8839a5bb1c
parent34e18f7d5a368d8803dff28af005b265e1ac1fb3
Merge branch 'master' of https://github.com/Javafant/diaspora-api to
be able to push to it