From: friendica <info@friendica.com>
Date: Tue, 25 Sep 2012 03:54:55 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c8960fe3db6025f33d27f5f6a73b7acc1a449ce2;p=friendica.git

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

c8960fe3db6025f33d27f5f6a73b7acc1a449ce2