From: friendica <info@friendica.com>
Date: Sat, 22 Sep 2012 01:10:32 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b6b8f40fa917d2de8bcb2d71ec598f6b4bee217d;p=friendica.git

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

b6b8f40fa917d2de8bcb2d71ec598f6b4bee217d