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