Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
authorRoland Haeder <roland@mxchange.org>
Tue, 1 Mar 2016 17:29:34 +0000 (18:29 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 1 Mar 2016 17:29:34 +0000 (18:29 +0100)

Trivial merge