Merge branch 'master' of git://github.com/erlehmann/minetest-delta
authorPerttu Ahola <celeron55@gmail.com>
Fri, 22 Jul 2011 19:59:15 +0000 (22:59 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Fri, 22 Jul 2011 19:59:15 +0000 (22:59 +0300)

Trivial merge