From: Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>
Date: Thu, 21 Jun 2012 10:38:14 +0000 (+0300)
Subject: Merge git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5e3e3915e347e4c298498ce0a8c493b9cd03201b;p=friendica.git

Merge git://github.com/friendica/friendica
---

5e3e3915e347e4c298498ce0a8c493b9cd03201b