From: friendica <info@friendica.com>
Date: Wed, 14 Mar 2012 21:34:48 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2dc527609e2f46dfeaa627833ccfbf2f9c0d7654;p=friendica.git

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

2dc527609e2f46dfeaa627833ccfbf2f9c0d7654