From: Matthias Krüger Date: Sun, 9 Jun 2013 07:23:18 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/gitignore X-Git-Tag: xonotic-v0.8.0~118^2~1 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=8caa9ad5b75ea402e4bb01a3df8193d30a68d86d Merge branch 'master' into matthiaskrgr/gitignore --- 8caa9ad5b75ea402e4bb01a3df8193d30a68d86d