From: friendica <info@friendica.com>
Date: Fri, 14 Sep 2012 13:05:22 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8497c6782ed668db8e1a9c376a272bb04cc95864;p=friendica.git

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

8497c6782ed668db8e1a9c376a272bb04cc95864