]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
authorRoland Haeder <roland@mxchange.org>
Fri, 4 Mar 2016 19:05:15 +0000 (20:05 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 4 Mar 2016 19:05:24 +0000 (20:05 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>

Trivial merge