Merge branch 'master' of https://github.com/wesnoth/wesnoth
fix whitespace
Merge branch 'master' of https://github.com/wesnoth/wesnoth