From: root <root@diekershoff.homeunix.net>
Date: Sun, 23 Jan 2011 07:46:57 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/tobiasd/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=71294faf2c182a678e5889b2ff9cabed16d83c82;p=friendica.git

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

71294faf2c182a678e5889b2ff9cabed16d83c82