From: Michael Vogel Date: Sun, 5 Apr 2015 18:30:38 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8bdb026745a442ef8aa4ba9ee44d0be30f8b80d4;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 8bdb026745a442ef8aa4ba9ee44d0be30f8b80d4