Merge branch 'martin-t/misc' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 01:25:48 +0000 (01:25 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 01:25:48 +0000 (01:25 +0000)
martin-t/misc

See merge request !399

1  2 
defaultXonotic.cfg
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc

Simple merge