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

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

b11f3b702f40f28a1962fd8f1087d97237b3a405