From: Michael Vogel <icarus@dabo.de>
Date: Sat, 28 May 2016 11:53:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=06af9e017c0f8a4809649390f812cbade5ded677;p=friendica-addons.git

Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
---

06af9e017c0f8a4809649390f812cbade5ded677