From: Roland Haeder <roland@mxchange.org>
Date: Tue, 1 Mar 2016 17:29:34 +0000 (+0100)
Subject: Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6318d284353ad48ddf58a9208fd9fc0966d4d647;p=friendica.git

Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
---

6318d284353ad48ddf58a9208fd9fc0966d4d647