From: friendica <info@friendica.com>
Date: Wed, 25 Jul 2012 22:55:30 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6ac45f2f6fb93fad0dbbdbfdcf0e9beb6a4a0db9;p=friendica.git

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

6ac45f2f6fb93fad0dbbdbfdcf0e9beb6a4a0db9