Merge branch 'master' into divVerent/german-translation

author Rudolf Polzer <divverent@alientrap.org>

Mon, 17 Jan 2011 12:19:39 +0000 (13:19 +0100)

committer Rudolf Polzer <divverent@alientrap.org>

Mon, 17 Jan 2011 12:19:39 +0000 (13:19 +0100)
author Rudolf Polzer <divverent@alientrap.org>
Mon, 17 Jan 2011 12:19:39 +0000 (13:19 +0100)
committer Rudolf Polzer <divverent@alientrap.org>
Mon, 17 Jan 2011 12:19:39 +0000 (13:19 +0100)
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
Simple merge
author	Rudolf Polzer <divverent@alientrap.org>
	Mon, 17 Jan 2011 12:19:39 +0000 (13:19 +0100)
committer	Rudolf Polzer <divverent@alientrap.org>
	Mon, 17 Jan 2011 12:19:39 +0000 (13:19 +0100)