From: cbrutail <ruszkai.akos@gmail.com>
Date: Thu, 16 Feb 2012 15:42:08 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/translation-hu_0.6
X-Git-Tag: xonotic-v0.6.0~48^2~1^2~7
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=120e26841a6db8566b8b55f6a0625ff5bcf5d3ad;p=xonotic%2Fxonotic-data.pk3dir.git

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

120e26841a6db8566b8b55f6a0625ff5bcf5d3ad