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

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

2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7