From: Michael <icarus@dabo.de>
Date: Wed, 11 Apr 2012 16:47:21 +0000 (+0200)
Subject: Merge branch 'master' of github.com:annando/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c3139fa0fd49b0b4de4568d46a6946c75ccb2a62;p=friendica.git

Merge branch 'master' of github.com:annando/friendica
---

c3139fa0fd49b0b4de4568d46a6946c75ccb2a62