From: Michael Vogel Date: Sun, 14 Jun 2015 22:55:05 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0e157b128849f3ee803c88cc72e330751fba3efa;p=friendica.git Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check --- 0e157b128849f3ee803c88cc72e330751fba3efa