From: friendica <info@friendica.com>
Date: Fri, 13 Jul 2012 21:57:08 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=10915b8feb03f1e4c93277d6d2c6f3e0b1f0501e;p=friendica.git

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

10915b8feb03f1e4c93277d6d2c6f3e0b1f0501e