]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into cbrutail/translation-hu_0.6
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 26 Jan 2012 11:25:55 +0000 (12:25 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 26 Jan 2012 11:25:55 +0000 (12:25 +0100)

Trivial merge