From: friendica <info@friendica.com>
Date: Tue, 8 May 2012 01:48:26 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b128a37cee7b49ae83d16ddfd3cd99097a80b9f9;p=friendica.git

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

b128a37cee7b49ae83d16ddfd3cd99097a80b9f9