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

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

5cd943bfb2c35a9caf708cc1bacdb6271abbfce1