From: pixelroot <info@pixelbits.de>
Date: Mon, 24 Sep 2012 06:46:25 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c44d068adf9e31f7931cc54a787692bcf60b70ea;p=friendica.git

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

c44d068adf9e31f7931cc54a787692bcf60b70ea