From: Domovoy <domovoy@errlock.org>
Date: Fri, 17 Aug 2012 07:46:43 +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=1581e02f8f2dd6c4515cbb33f3cb85b8f66ec8e0;p=friendica.git

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

1581e02f8f2dd6c4515cbb33f3cb85b8f66ec8e0