From: Michael Vogel Date: Sun, 20 Oct 2013 11:01:24 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e6480286651b401a079a99c4034cd80fbed4b3e;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 2e6480286651b401a079a99c4034cd80fbed4b3e