From: Michael Vogel <icarus@dabo.de>
Date: Thu, 17 Jan 2013 22:31:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f6b64a8fd145eba8959c1b03b11e442df70d37b;p=friendica-addons.git

Merge remote-tracking branch 'upstream/master'
---

9f6b64a8fd145eba8959c1b03b11e442df70d37b