From: Michael <icarus@dabo.de>
Date: Mon, 18 Jun 2012 06:48:12 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c5ba7f533dd5d45659e539c6418a144809ba66ed;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

c5ba7f533dd5d45659e539c6418a144809ba66ed