Merge branch 'master' into terencehill/arena_and_ca_fixes
authorterencehill <piuntn@gmail.com>
Thu, 12 Jan 2012 19:14:07 +0000 (20:14 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 12 Jan 2012 19:14:07 +0000 (20:14 +0100)
1  2 
qcsrc/server/defs.qh

Simple merge