From: friendica <info@friendica.com>
Date: Fri, 26 Oct 2012 21:30:23 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ab78e2064c57c3d22114aacdc4668b52f431fb9b;p=friendica.git

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

ab78e2064c57c3d22114aacdc4668b52f431fb9b