From: friendica <info@friendica.com>
Date: Sun, 12 May 2013 00:04:51 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aee74299672e207aac50bb7ad814fc5ea2aec28d;p=friendica.git

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

aee74299672e207aac50bb7ad814fc5ea2aec28d