From: friendica <info@friendica.com>
Date: Sun, 5 Aug 2012 00:03:32 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bc5b54d7b79e40f6160d68e68b3ea3ec078b1d02;p=friendica.git

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

bc5b54d7b79e40f6160d68e68b3ea3ec078b1d02