From: friendica <info@friendica.com>
Date: Thu, 3 May 2012 05:38:17 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2bfba93940e9b7eecca7ae3496f1fd24a7cb44f7;p=friendica.git

Merge https://github.com/friendica/friendica into pull
---

2bfba93940e9b7eecca7ae3496f1fd24a7cb44f7