From: Domovoy <domovoy@errlock.org>
Date: Sun, 12 Aug 2012 15:34:23 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=04f14d96c679d1732993252d137515ad38c4b41f;p=friendica.git

Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
---

04f14d96c679d1732993252d137515ad38c4b41f