Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Fri, 24 Jan 2014 21:33:35 +0000 (16:33 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 24 Jan 2014 21:33:35 +0000 (16:33 -0500)
commitbed0faf9537a0cddd6aadf29625458da94bbf5f1
tree9d9cebad485292ad5bafa1864d25ec2e64ffb26c
parent2282d39ba8c543281c93f038c2c00928cea5abab
parente8db49653fa21bf88c253145f80b66dfc7a1d277
Merge remote-tracking branch 'origin/master' into samual/combined_updates

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/command/vote.qc