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

Trivial merge