From: Michael Vogel Date: Tue, 22 Dec 2015 10:27:49 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a91ce7c0d10ffc59327e3551cf75fd1c264ef646;p=friendica.git Merge remote-tracking branch 'upstream/master' --- a91ce7c0d10ffc59327e3551cf75fd1c264ef646