Merge branch 'master' into terencehill/start_ammo
authorterencehill <piuntn@gmail.com>
Sun, 14 Dec 2014 22:42:07 +0000 (23:42 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 14 Dec 2014 22:42:07 +0000 (23:42 +0100)
1  2 
qcsrc/server/miscfunctions.qc

Simple merge