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

Merge remote branch 'upstream/master'
---

d87e6982f986027e681ec18c13afc30807a09908