From: Michael Vogel <icarus@dabo.de>
Date: Thu, 16 May 2013 22:01:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f75ef0c59e13abe3ed8418952b87669725034ada;p=friendica-addons.git

Merge remote-tracking branch 'upstream/master'
---

f75ef0c59e13abe3ed8418952b87669725034ada