From: Michael Vogel Date: Thu, 24 Dec 2015 12:09:18 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9ab5bfb5074ddba22777c3b043bb539a473288a5;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 9ab5bfb5074ddba22777c3b043bb539a473288a5