From: Michael Vogel <ike@pirati.ca>
Date: Sat, 8 Oct 2016 21:44:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fa24de0107a8637bbf87bb5672bec6d6b792548e;p=friendica-addons.git

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

fa24de0107a8637bbf87bb5672bec6d6b792548e