From: cbrutail <ruszkai.akos@gmail.com>
Date: Thu, 23 Feb 2012 21:39:48 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/translation-hu_0.6
X-Git-Tag: xonotic-v0.6.0~48^2~1^2~2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=b31fdb3f0d23f507bb97e84b7a3171570f58fa61

Merge branch 'master' into cbrutail/translation-hu_0.6

Conflicts:
	menu.dat.hu.po

merge master, but keep the since modified files in local
---

b31fdb3f0d23f507bb97e84b7a3171570f58fa61