From: terencehill <piuntn@gmail.com>
Date: Thu, 27 Aug 2015 15:18:41 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/quickmenu
X-Git-Tag: xonotic-v0.8.2~1987^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8e214d23e2cab174facf54bf032bdde8d1e5304;p=xonotic%2Fxonotic-data.pk3dir.git

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

e8e214d23e2cab174facf54bf032bdde8d1e5304