Merge branch 'develop' of github.com:diaspora/diaspora into develop
authorJonne Haß <me@mrzyx.de>
Fri, 4 Apr 2014 08:01:30 +0000 (10:01 +0200)
committerJonne Haß <me@mrzyx.de>
Fri, 4 Apr 2014 08:01:30 +0000 (10:01 +0200)
commitc634aba2677b6b59401a40e1927d051ef36cc696
tree2e4bec931f499dba8b4c8ade67a85942901ae736
parentbe19c2f10415d29b741beb47822ded84ce22b693
parent5d62c17259c07c4a9713ebb4ef1e3f9a7f0ae1e9
Merge branch 'develop' of github.com:diaspora/diaspora into develop