From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 18:27:18 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=746a42e4e03af3b0298c125e72d056607c7c43e7;p=friendica-addons.git

Merge commit 'upstream/master'
---

746a42e4e03af3b0298c125e72d056607c7c43e7