From: friendica <info@friendica.com>
Date: Tue, 19 Jun 2012 23:08:38 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6e06d415bb1fa085515937229b167fc59acfc194;p=friendica.git

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

6e06d415bb1fa085515937229b167fc59acfc194