From: Friendika <info@friendika.com>
Date: Tue, 25 Jan 2011 12:00:46 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/tobiasd/friendika into tobiasd-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e83db7876de79d392050dd71f0dc191325c8b8db;p=friendica.git

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

e83db7876de79d392050dd71f0dc191325c8b8db