Fix merge conflict with changelog
Fix merge conflict with changelog

SuperTux88/diaspora,Amadren/diaspora,geraspora/diaspora,diaspora/diaspora,diaspora/diaspora,despora/diaspora,jhass/diaspora,Flaburgan/diaspora,despora/diaspora,KentShikama/diaspora,KentShikama/diaspora,KentShikama/diaspora,Flaburgan/diaspora,despora/diaspora,diaspora/diaspora,geraspora/diaspora,jhass/diaspora,spixi/diaspora,SuperTux88/diaspora,SuperTux88/diaspora,jhass/diaspora,Muhannes/diaspora,despora/diaspora,spixi/diaspora,Muhannes/diaspora,geraspora/diaspora,Muhannes/diaspora,SuperTux88/diaspora,Amadren/diaspora,spixi/diaspora,Muhannes/diaspora,KentShikama/diaspora,jhass/diaspora,Amadren/diaspora,diaspora/diaspora,Amadren/diaspora,Flaburgan/diaspora,geraspora/diaspora,Flaburgan/diaspora,spixi/diaspora