From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 7 Aug 2016 04:49:39 +0000 (+1000)
Subject: Merge branch 'TimePath/bot_api'
X-Git-Tag: xonotic-v0.8.2~745
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2e2557d4f7fcbf008ec437fa3dfc98ded3c8f488

Merge branch 'TimePath/bot_api'
---

2e2557d4f7fcbf008ec437fa3dfc98ded3c8f488