From: friendica <info@friendica.com>
Date: Mon, 18 Mar 2013 23:41:56 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=108f2e1b81800f100f5896dae73af3463b1ecb6a;p=friendica.git

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

108f2e1b81800f100f5896dae73af3463b1ecb6a