From: friendica <info@friendica.com>
Date: Thu, 4 Oct 2012 01:28:27 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0bfca1404847ef5dd300f9e18f95ef48e4c65fde;p=friendica.git

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

0bfca1404847ef5dd300f9e18f95ef48e4c65fde