From: Michael Vogel Date: Mon, 13 Jun 2016 20:32:40 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1606-time-travel X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a05f0c39a673569eb6d6c74709bb06d565bdaf1d;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1606-time-travel --- a05f0c39a673569eb6d6c74709bb06d565bdaf1d