From: friendica <info@friendica.com>
Date: Tue, 12 Jun 2012 08:02:05 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c53e1112d55b45a3320b151bcc56b9d2340082d7;p=friendica.git

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

c53e1112d55b45a3320b151bcc56b9d2340082d7