From: Michael Vogel Date: Thu, 9 Apr 2015 17:49:33 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1504-parse_url X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e81f9c91faabbf3ebd66e7726ebaf19faa387b5e;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1504-parse_url --- e81f9c91faabbf3ebd66e7726ebaf19faa387b5e