From: friendica <info@friendica.com>
Date: Fri, 27 Apr 2012 08:10:33 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=153534bc700e95bd3c248a1e094319dbf57ca297;p=friendica.git

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

153534bc700e95bd3c248a1e094319dbf57ca297