From: friendica <info@friendica.com>
Date: Fri, 14 Sep 2012 00:00:47 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=269bb75a1460ac84f3f05bc6b6af58c1b20a3e18;p=friendica.git

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

269bb75a1460ac84f3f05bc6b6af58c1b20a3e18