From: Mario <zacjardine@y7mail.com>
Date: Sat, 13 Dec 2014 05:19:00 +0000 (+0000)
Subject: Merge branch 'terencehill/misc_cleanups' into 'master'
X-Git-Tag: xonotic-v0.8.0~116
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=2ea018e26b688038823d6a52a17ab8b6abd26a9e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/misc_cleanups' into 'master'

Terencehill/misc cleanups

Miscellaneous cleanups and some small fixes

See merge request !46
---

2ea018e26b688038823d6a52a17ab8b6abd26a9e