Merge branch 'master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 03:27:46 +0000 (14:27 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 03:27:46 +0000 (14:27 +1100)
commit8f8c153ded2fc16282faf86ec673b3d44120801c
treee35b3c31f637522b62d6bf5676caeaafc2e5814b
parentc2aaebd96fbcbd6bdee718e34b42a755e6755f4d
parentf6de28b8f7cc072475da92808b0a2223c112d291
Merge branch 'master' into Mario/weapons_new

Conflicts:
qcsrc/client/scoreboard.qc
qcsrc/server/w_minstanex.qc