From: cbrutail <ruszkai.akos@gmail.com>
Date: Sat, 18 Feb 2012 11:14:48 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/translation-hu_0.6
X-Git-Tag: xonotic-v0.6.0~48^2~1^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ab4b99067cf89f0ef8dbad46d60ff00cccf1d4d;p=xonotic%2Fxonotic-data.pk3dir.git

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

0ab4b99067cf89f0ef8dbad46d60ff00cccf1d4d