From: friendica <info@friendica.com>
Date: Sun, 30 Sep 2012 09:08:56 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=84199e6e71eafa135f2745eca95910027f077a1c;p=friendica.git

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

84199e6e71eafa135f2745eca95910027f077a1c