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