Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Mon, 12 Dec 2011 04:41:12 +0000 (23:41 -0500)
committerSamual <samual@xonotic.org>
Mon, 12 Dec 2011 04:41:12 +0000 (23:41 -0500)
commit71cc10cff88137a5d25f40bc5f62f1291f430c65
tree52d51c07e5c77664e09dcf0c2e363dad414ad4a5
parent71e6fbb5ce58754ef792ed43786967bc25f88e1b
parentfdc6550fe8559e3a4ce5bc5769b1d3d0747207c9
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
qcsrc/server/clientcommands.qc
qcsrc/server/bot/scripting.qc
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh