From: Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net>
Date: Sat, 23 Jun 2012 20:51:08 +0000 (+0300)
Subject: Merge git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00668aaa71336f48b141c443749a66c58a555503;p=friendica.git

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

00668aaa71336f48b141c443749a66c58a555503