Merge branch 'master' into TimePath/combined_updates
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 01:09:46 +0000 (12:09 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 01:09:46 +0000 (12:09 +1100)
1  2 
qcsrc/server/cl_player.qc

Simple merge