From: Michael Vogel Date: Mon, 17 Dec 2012 09:32:53 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a6b1275f16ab67a26ac1a4cc18cffd3d454b0940;p=friendica.git Merge remote-tracking branch 'upstream/master' --- a6b1275f16ab67a26ac1a4cc18cffd3d454b0940