From: Michael Vogel Date: Wed, 30 Sep 2015 08:03:52 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aa9ceabdd9eeec82393e4d5f09aad09c181af33d;p=friendica.git Merge remote-tracking branch 'upstream/master' --- aa9ceabdd9eeec82393e4d5f09aad09c181af33d