From: Matthias Krüger Date: Thu, 13 Jun 2013 20:45:40 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/gitignore X-Git-Tag: xonotic-v0.8.0~118^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48837fe02a59a2118276e26aef3ba076590788da;p=xonotic%2Fxonotic.git Merge branch 'master' into matthiaskrgr/gitignore --- 48837fe02a59a2118276e26aef3ba076590788da