Merge branch 'master' into terencehill/menu_optimization

author terencehill <piuntn@gmail.com>

Thu, 24 Dec 2015 00:46:46 +0000 (01:46 +0100)

committer terencehill <piuntn@gmail.com>

Thu, 24 Dec 2015 00:46:46 +0000 (01:46 +0100)
author terencehill <piuntn@gmail.com>
Thu, 24 Dec 2015 00:46:46 +0000 (01:46 +0100)
committer terencehill <piuntn@gmail.com>
Thu, 24 Dec 2015 00:46:46 +0000 (01:46 +0100)
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Thu, 24 Dec 2015 00:46:46 +0000 (01:46 +0100)
committer	terencehill <piuntn@gmail.com>
	Thu, 24 Dec 2015 00:46:46 +0000 (01:46 +0100)