From: Michael <icarus@dabo.de>
Date: Fri, 2 Mar 2012 09:32:57 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7097dd6aa735d9b5853f0c5c0c4acee25aaeb7dd;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

7097dd6aa735d9b5853f0c5c0c4acee25aaeb7dd