Merge branch 'master' into Mario/mutators
authorMario <mario.mario@y7mail.com>
Fri, 12 Jul 2013 00:04:10 +0000 (10:04 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 12 Jul 2013 00:04:10 +0000 (10:04 +1000)
1  2 
defaultXonotic.cfg
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge