From: cbrutail <ruszkai.akos@gmail.com>
Date: Sun, 29 Jan 2012 12:50:50 +0000 (+0100)
Subject: Merge branch 'master' into cbrutail/translation-hu_0.6
X-Git-Tag: xonotic-v0.6.0~48^2~1^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=26625d1ea8cc505e3fc97d982144343e49ec9ce1;p=xonotic%2Fxonotic-data.pk3dir.git

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

26625d1ea8cc505e3fc97d982144343e49ec9ce1