From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 13 May 2015 11:41:37 +0000 (+0200)
Subject: Merge pull request #1 from friendica/develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5837fd4f817c06a723af9ad27298b6bef40e37e5;p=friendica.git

Merge pull request #1 from friendica/develop

Update from friendica develop branch
---

5837fd4f817c06a723af9ad27298b6bef40e37e5