From: Michael <icarus@dabo.de>
Date: Fri, 2 Mar 2012 13:35:13 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c0560f4275c7c42131e6b84fcf06c4081c3fc39;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

8c0560f4275c7c42131e6b84fcf06c4081c3fc39