From: friendica <info@friendica.com>
Date: Thu, 16 Aug 2012 22:24:57 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=86d867f96f465867ba655c30dd13f4e437a75c21;p=friendica.git

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

86d867f96f465867ba655c30dd13f4e437a75c21