Merge branch 'upstream/master'

.hgignore

CMakeLists.txt

data/oerkki1_damaged.png

data/unknown_block.png

doc/changelog.txt

minetest.conf.example

src/CMakeLists.txt

src/activeobject.h

src/client.cpp

src/client.h

src/clientobject.cpp

src/clientobject.h

src/clientserver.h

src/collision.cpp

src/collision.h

src/content_cao.cpp

src/content_cao.h

src/content_inventory.cpp

src/content_mapblock.cpp

src/content_mapnode.cpp