Merge branch 'master' of github.com:erlehmann/minetest-delta
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 20:33:26 +0000 (22:33 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sat, 30 Jul 2011 20:33:26 +0000 (22:33 +0200)

Trivial merge