Merge branch 'master' of https://github.com/Javafant/diaspora-api
authorMarek Marecki <triviuss@gmail.com>
Fri, 24 May 2013 20:08:58 +0000 (22:08 +0200)
committerMarek Marecki <triviuss@gmail.com>
Fri, 24 May 2013 20:08:58 +0000 (22:08 +0200)
commitab3ee5e6a3e3c36328e83d62dbff982051469996
treec482153a64ca0de1cc32e930bce9874b66e5d9f3
parent2242284612a9b85656d8dc8ca43d93ddf27de093
parentc8e8dd74bc8801b6c97932a81180960319714046
Merge branch 'master' of https://github.com/Javafant/diaspora-api