From: Michael Vogel Date: Sun, 24 Jan 2016 17:21:09 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a2d025232b93ff65370f592f847de75ed784d11b;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-dfrn --- a2d025232b93ff65370f592f847de75ed784d11b