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

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

db0b7c36ea07f7d56009b7453a95e5149107f896