From: friendica <info@friendica.com>
Date: Sat, 28 Apr 2012 02:40:24 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e356920e149a296100e729d61c0c291c9427ed44;p=friendica.git

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

e356920e149a296100e729d61c0c291c9427ed44