From: Michael Vogel Date: Mon, 3 Dec 2012 07:30:49 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5635fe250ca4ef8e1dcf12cfe0f49b2a23c86b16;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 5635fe250ca4ef8e1dcf12cfe0f49b2a23c86b16