From: Roland Haeder <roland@mxchange.org>
Date: Sat, 12 Mar 2016 21:57:10 +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=a589e5a49a47fa14b66eb63142872156e1e3de8a;p=friendica.git

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

a589e5a49a47fa14b66eb63142872156e1e3de8a