From: friendica <info@friendica.com>
Date: Thu, 26 Apr 2012 22:35:25 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2d94d216a3869827f890cbc2ca71f8b3d8ad935f;p=friendica.git

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

2d94d216a3869827f890cbc2ca71f8b3d8ad935f