Fix typo in doc/lua_api.txt
fix double free on player delete
Merge remote-tracking branch 'minetest/master'
use less [] on shared_map
Remove FPS from being next to the version string
Fix typos in doc/lua-api.txt
fix OS X enum clash
OOOPS
Merge pull request #100 from mdoege/osx

fix OS X enum clash
fix c29d31c - fix OS X enum clash
Disallow use [] on shared lock
Merge remote-tracking branch 'minetest/master'

Conflicts:
	doc/lua_api.txt
	src/game.cpp
Fix warnings reported by clang
Fix memory leak in EmergeManager
Fix errors/warnings reported by valgrind
Fix non-smooth non-shader node shading (Fixes #1436, regression by commit a0f78659f31abd)
Improve error reporting in leveldb backend
Switch android to leveldb as sqlite3 is broken and fails to save any mapblock there
Fix client crash on deletion of an object the clients localplayer is attached to
Update version numbers for 0.4.10