From: friendica <info@friendica.com>
Date: Mon, 30 Apr 2012 08:26:06 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=52e4098a3d257660ebaa5f81d9fb84371abe5297;p=friendica.git

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

52e4098a3d257660ebaa5f81d9fb84371abe5297