Merge branch 'master' into Mario/user_movetypes 356/head
authorMario <mario@smbclan.net>
Thu, 18 Aug 2016 15:06:52 +0000 (01:06 +1000)
committerMario <mario@smbclan.net>
Thu, 18 Aug 2016 15:06:52 +0000 (01:06 +1000)
1  2 
qcsrc/server/g_world.qc

Simple merge