From: Domovoy <domovoy@errlock.org>
Date: Tue, 7 Aug 2012 07:40:21 +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=f3b1391501361c3745743e23a8bfabe8fc06c1bf;p=friendica.git

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

f3b1391501361c3745743e23a8bfabe8fc06c1bf