Merge branch 'master' into terencehill/lms_itemtimes_fix 266/head
authorterencehill <piuntn@gmail.com>
Fri, 1 Jan 2016 22:16:25 +0000 (23:16 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 1 Jan 2016 22:16:25 +0000 (23:16 +0100)
commitf41d9f31538bef0259d2b2c74536bb977901f99d
treeb11fb09e6de556202af320273f3794f0cf048ca8
parent269d0d127b7dee89066dd0888094f9f870111290
parente068d17c382da29ad2af7f659e76d1e9fd4f02f8
Merge branch 'master' into terencehill/lms_itemtimes_fix

Conflicts:
qcsrc/server/mutators/mutator/gamemode_lms.qc
qcsrc/common/mutators/mutator/itemstime.qc
qcsrc/server/mutators/mutator/gamemode_lms.qc