From: Matthias Krüger Date: Thu, 13 Jun 2013 20:45:14 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/gitignore X-Git-Tag: xonotic-v0.8.0~389 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c58773440e625c00b8bd30e5d43337914f7b922b Merge branch 'master' into matthiaskrgr/gitignore --- c58773440e625c00b8bd30e5d43337914f7b922b