From: terencehill <piuntn@gmail.com>
Date: Tue, 6 Dec 2011 16:01:04 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/quickmenu
X-Git-Tag: xonotic-v0.8.2~1987^2~55^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c510308d4154dabbed5388a9437ac84e897edb7;p=xonotic%2Fxonotic-data.pk3dir.git

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

6c510308d4154dabbed5388a9437ac84e897edb7