From: friendica <info@friendica.com>
Date: Thu, 7 Jun 2012 05:29:35 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d2e86bdabc759b56ad8a9734bd0566aee036485e;p=friendica.git

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

d2e86bdabc759b56ad8a9734bd0566aee036485e