From: Domovoy <domovoy@errlock.org>
Date: Thu, 30 Aug 2012 05:47: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=ef52ff6b018238569e9db6a31dd2d6ce96e3481e;p=friendica.git

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

ef52ff6b018238569e9db6a31dd2d6ce96e3481e