From: Michael Vogel Date: Fri, 26 Dec 2014 17:08:08 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3908b9172d838e19f69c7d71ae3b7eb4d9c64871;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 3908b9172d838e19f69c7d71ae3b7eb4d9c64871