Merge branch 'master' into terencehill/tooltips_cleanup

author terencehill <piuntn@gmail.com>

Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)

committer terencehill <piuntn@gmail.com>

Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)
author terencehill <piuntn@gmail.com>
Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)
committer terencehill <piuntn@gmail.com>
Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)
committer	terencehill <piuntn@gmail.com>
	Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)