Merge branch 'master' into Lyberta/TeamplayFixes_
authorLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 14:57:47 +0000 (17:57 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 14:57:47 +0000 (17:57 +0300)
1  2 
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh

Simple merge
Simple merge