From: Domovoy <domovoy@errlock.org>
Date: Sun, 22 Jul 2012 10:10:48 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica into Imagick
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6608cc50185b63551d2496aac1bd4c65c45a9bdc;p=friendica.git

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

6608cc50185b63551d2496aac1bd4c65c45a9bdc