From: friendica <info@friendica.com>
Date: Thu, 10 May 2012 08:46:29 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=93ae6ee97b5afccee2cc37e9ce400c7da43dec47;p=friendica.git

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

93ae6ee97b5afccee2cc37e9ce400c7da43dec47