Forgot a merge conflict
Forgot a merge conflict

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