From: Michael Vogel Date: Sat, 20 Dec 2014 08:37:33 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1a0a80c310faf51b3c2274708162ad8d817365eb;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items --- 1a0a80c310faf51b3c2274708162ad8d817365eb