From: friendica <info@friendica.com>
Date: Sun, 11 Nov 2012 08:30:37 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a8072068047bc9c993333048ae09500717cbb6fb;p=friendica.git

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

a8072068047bc9c993333048ae09500717cbb6fb