From: Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>
Date: Mon, 25 Jun 2012 10:59:53 +0000 (+0300)
Subject: Merge git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=94f895e98df73efe32a7c986a4b7844b0ab8fc01;p=friendica.git

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

94f895e98df73efe32a7c986a4b7844b0ab8fc01