From: friendica <info@friendica.com>
Date: Thu, 9 May 2013 08:15:40 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=3339f55310587d96bb4e0cf43542719a5a41448b;p=friendica.git

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

3339f55310587d96bb4e0cf43542719a5a41448b