Merge http://github.com/minetest/minetest
Merge branch 'master' of http://github.com/Novatux/minetest