From: friendica <info@friendica.com>
Date: Wed, 11 Jul 2012 03:33:28 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3076f838f6d6194f5088097282a89c68e27f044c;p=friendica.git

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

3076f838f6d6194f5088097282a89c68e27f044c