From: terencehill <piuntn@gmail.com>
Date: Wed, 25 Feb 2015 18:14:07 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/quickmenu
X-Git-Tag: xonotic-v0.8.2~1987^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a96096dbc3be796d0b5fc0ab8528cd7b8d9e0b03;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/quickmenu
---

a96096dbc3be796d0b5fc0ab8528cd7b8d9e0b03