From: Michael <icarus@dabo.de>
Date: Wed, 11 Apr 2012 16:49:11 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f6f0578d123202f30a839975e67b152c299c2323;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

f6f0578d123202f30a839975e67b152c299c2323