From: Roland Haeder <roland@mxchange.org>
Date: Sat, 12 Mar 2016 17:50:14 +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=c60605ce0cae9a2bba27057f100fbd3fa501c98d;p=friendica.git

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

c60605ce0cae9a2bba27057f100fbd3fa501c98d