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

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

130cc252a77dbcaf03bbe1d1d60d50545c2d20cb