From: Mario <mario.mario@y7mail.com>
Date: Wed, 25 Sep 2019 23:51:52 +0000 (+0000)
Subject: Merge branch 'martin-t/vbots' into 'master'
X-Git-Tag: xonotic-v0.8.5~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e91a2c46dee36129396d942fac174154d8ed162;p=xonotic%2Fxonotic.git

Merge branch 'martin-t/vbots' into 'master'

Add bots, nobots, document new bot skill

See merge request xonotic/xonotic!52
---

7e91a2c46dee36129396d942fac174154d8ed162