From: Michael Vogel <icarus@dabo.de>
Date: Sat, 18 May 2013 18:52:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b6d0584834f1f0217c07f9112e70ddcd95d08cf8;p=friendica-addons.git

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

b6d0584834f1f0217c07f9112e70ddcd95d08cf8