From: friendica <info@friendica.com>
Date: Wed, 25 Apr 2012 07:14:20 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=50f10a4fd78043b4aaf82abd856730543928382b;p=friendica.git

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

50f10a4fd78043b4aaf82abd856730543928382b