From: Michael Vogel Date: Sun, 15 Jun 2014 16:26:59 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e1c7c2b092727b81b383d54928140ea58a3407f2;p=friendica.git Merge remote-tracking branch 'upstream/master' --- e1c7c2b092727b81b383d54928140ea58a3407f2