From: Michael Vogel <icarus@dabo.de>
Date: Sat, 7 Apr 2012 16:33:41 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d5e13597161b3e9073764990828d97bec05ef70e;p=friendica-addons.git

Merge commit 'upstream/master'
---

d5e13597161b3e9073764990828d97bec05ef70e