Merge branch 'master' into fruitiex/racefixes
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 11:02:13 +0000 (14:02 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 11:02:13 +0000 (14:02 +0300)
1  2 
defaultXonotic.cfg

Simple merge