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