From: terencehill <piuntn@gmail.com>
Date: Wed, 9 Nov 2011 23:33:17 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/quickmenu
X-Git-Tag: xonotic-v0.8.2~1987^2~55^2~33
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f2112ed6b7792c44ed5d9568ba8f20aad6885aff;p=xonotic%2Fxonotic-data.pk3dir.git

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

f2112ed6b7792c44ed5d9568ba8f20aad6885aff