From: friendica <info@friendica.com>
Date: Tue, 28 May 2013 11:53:27 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8fe82d35d4b756b5f6649614fb011ea2c05ba056;p=friendica.git

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

8fe82d35d4b756b5f6649614fb011ea2c05ba056