Merge remote branch 'origin/mirceakitsune/minor_changes'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 4 May 2010 11:12:17 +0000 (13:12 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 4 May 2010 11:12:17 +0000 (13:12 +0200)
1  2 
defaultXonotic.cfg

Simple merge