From: friendica <info@friendica.com>
Date: Tue, 14 Aug 2012 22:22:45 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9553aeb3bd26e3e18b7677a26982a6b1df4c55fb;p=friendica.git

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

9553aeb3bd26e3e18b7677a26982a6b1df4c55fb