From: root <root@diekershoff.homeunix.net>
Date: Fri, 21 Jan 2011 10:56:47 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/tobiasd/friendika
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e0d6d68f606f2c6d372a2c6e8299cab74d42f9cb;p=friendica.git

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

e0d6d68f606f2c6d372a2c6e8299cab74d42f9cb