Merge remote-tracking branch 'origin/master' into zykure/teamscores
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 22:23:54 +0000 (18:23 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 22:23:54 +0000 (18:23 -0400)
1  2 
qcsrc/server/cl_player.qc

Simple merge