From: Michael Vogel Date: Wed, 4 Dec 2013 23:13:31 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b750379a47169275bbf7b8814f7fa6f86c37740a;p=friendica.git Merge remote-tracking branch 'upstream/master' --- b750379a47169275bbf7b8814f7fa6f86c37740a