Merge branch 'master' into terencehill/translate_colors_2
authorterencehill <piuntn@gmail.com>
Sun, 13 Mar 2016 13:13:44 +0000 (14:13 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 13 Mar 2016 13:13:44 +0000 (14:13 +0100)
1  2 
qcsrc/common/teams.qh

Simple merge