From: friendica <info@friendica.com>
Date: Fri, 15 Jun 2012 00:39:17 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c94fa23bfebf6d6b9930ed83a86e9cdae55d28f;p=friendica.git

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

8c94fa23bfebf6d6b9930ed83a86e9cdae55d28f