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

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

af34cf019c5742abadab19586f3931353d8d3ff8