From: friendica <info@friendica.com>
Date: Wed, 10 Oct 2012 22:59:05 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8a1f9d32aba449491b93303b1f32fb6214823a36;p=friendica.git

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

8a1f9d32aba449491b93303b1f32fb6214823a36