Merge branch 'master' into terencehill/player_model_zoom

author terencehill <piuntn@gmail.com>

Mon, 5 Aug 2013 23:09:06 +0000 (01:09 +0200)

committer terencehill <piuntn@gmail.com>

Mon, 5 Aug 2013 23:09:06 +0000 (01:09 +0200)
author terencehill <piuntn@gmail.com>
Mon, 5 Aug 2013 23:09:06 +0000 (01:09 +0200)
committer terencehill <piuntn@gmail.com>
Mon, 5 Aug 2013 23:09:06 +0000 (01:09 +0200)
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
Simple merge
author	terencehill <piuntn@gmail.com>
	Mon, 5 Aug 2013 23:09:06 +0000 (01:09 +0200)
committer	terencehill <piuntn@gmail.com>
	Mon, 5 Aug 2013 23:09:06 +0000 (01:09 +0200)