Merge branch 'master' into Mario/mutators2
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 13:55:46 +0000 (00:55 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 13:55:46 +0000 (00:55 +1100)
commit7c46d29ba4098441f430f20d2bb6f76a49b0ec68
treec10aeafca123aaf9ad75855500e3c254dffee0f8
parent75f257c5016b7a4bf92a2c737a81273d6b258371
parentc412d3eef639e2d8b68682c51fd44bedb5d4308f
Merge branch 'master' into Mario/mutators2

Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
.gitignore
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutators.qc
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/mutators/mutators_include.qh
qcsrc/server/progs.src