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

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

b550b1326b9e45c1938b738407c6b32cbace09cb