From: Michael Vogel <icarus@dabo.de>
Date: Sun, 17 Jun 2012 07:13:25 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=daed8c8720360461c53643d45c9520a094d8bd08;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

daed8c8720360461c53643d45c9520a094d8bd08