From: Michael <heluecht@pirati.ca>
Date: Sun, 13 Nov 2016 19:12:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1611-parseurl
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1aa9b7242d65191fcee2804489d6b0beb4ea550c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1611-parseurl
---

1aa9b7242d65191fcee2804489d6b0beb4ea550c