From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 23 Aug 2015 09:52:55 +0000 (+0000)
Subject: Merge branch 'Mario/turrets' into 'master'
X-Git-Tag: xonotic-v0.8.2~2052
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=4b7b0e137af409648a48002058cff08e2da542b9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/turrets' into 'master'

Mario/turrets

See merge request !194
---

4b7b0e137af409648a48002058cff08e2da542b9