OttoLidenbrock d649afa044 Merge upstream ...

Conflicts:
	builtin/mainmenu/tab_simple_main.lua
	src/client/clientlauncher.cpp
	src/game.cpp
	src/guiEngine.cpp

2015-04-29 19:59:54 +10:00

..

android

Merge upstream

2015-04-29 19:59:54 +10:00