From: Michael Vogel <icarus@dabo.de>
Date: Tue, 29 May 2012 14:41:05 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1c955bff9bcd9a8ea1a5aa3d7ff96b6f2aef8f6f;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

1c955bff9bcd9a8ea1a5aa3d7ff96b6f2aef8f6f