From: Michael Vogel Date: Tue, 6 Oct 2015 05:41:09 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eefedc019befc9d8d99ba6e7ef5b537493681770;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy --- eefedc019befc9d8d99ba6e7ef5b537493681770