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