From: friendica <info@friendica.com>
Date: Mon, 9 Jul 2012 05:34:21 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ab710bce3b2a1a4154a8e5d4ba72e9b3da691bd9;p=friendica.git

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

ab710bce3b2a1a4154a8e5d4ba72e9b3da691bd9