From: Michael <heluecht@pirati.ca>
Date: Thu, 29 Dec 2016 17:13:07 +0000 (+0000)
Subject: Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=666eb2ddbd3876ee85e2a0a2312672a4f3847641;p=friendica.git

Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora
---

666eb2ddbd3876ee85e2a0a2312672a4f3847641