From: Matthias Krüger Date: Sun, 9 Jun 2013 07:22:21 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/gitignore X-Git-Tag: xonotic-v0.8.0~390 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f30917db125403c9555832769bc2fc728444670;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into matthiaskrgr/gitignore --- 8f30917db125403c9555832769bc2fc728444670