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

Merge remote branch 'upstream/master'
---

bf2d3a835690697eafc5f6ec8fda9a0dcb34a42f