From: friendica <info@friendica.com>
Date: Wed, 24 Apr 2013 01:51:50 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f090564f0feb01ef34aef56a7a63d99757bb901a;p=friendica.git

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

f090564f0feb01ef34aef56a7a63d99757bb901a