From: Michael Vogel <icarus@dabo.de>
Date: Fri, 25 May 2012 14:19:32 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=54ece4f4841e5df54822ca3c91e7139757462a5f;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

54ece4f4841e5df54822ca3c91e7139757462a5f