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

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

d20cdf09eafbc57c1b6dbcb78a5cdaa731ae876d