From: friendica <info@friendica.com>
Date: Fri, 22 Jun 2012 22:27:54 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4e7eb36dd1e65bf481ffe30614565674cbef4fe5;p=friendica.git

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

4e7eb36dd1e65bf481ffe30614565674cbef4fe5