From: root <root@diekershoff.homeunix.net>
Date: Sat, 22 Jan 2011 08:22:16 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/tobiasd/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0dc7e0975a7cd02d8c79dda42c836c31d84c9e24;p=friendica.git

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

0dc7e0975a7cd02d8c79dda42c836c31d84c9e24