From: Michael Vogel <icarus@dabo.de>
Date: Wed, 11 Apr 2012 06:29:23 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=63d605702fe5f98d3215cf0172748b41f7881db9;p=friendica-addons.git

Merge commit 'upstream/master'
---

63d605702fe5f98d3215cf0172748b41f7881db9