From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Wed, 7 Mar 2012 11:06:20 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4690d00141352db8ca96359cbbf65ce6eb4345c4;p=friendica.git

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

4690d00141352db8ca96359cbbf65ce6eb4345c4