From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 14:08:26 +0000 (+1100)
Subject: Merge branch 'Mario/config_updates'
X-Git-Tag: xonotic-v0.8.0~167
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbd25803840bd247e33b88250a402b31c196b717;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/config_updates'
---

bbd25803840bd247e33b88250a402b31c196b717