From: friendica <info@friendica.com>
Date: Thu, 12 Apr 2012 12:46:24 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6fa8b3067fad3a974b5e08e78739f83681f9bb6f;p=friendica.git

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

6fa8b3067fad3a974b5e08e78739f83681f9bb6f