From: terencehill <piuntn@gmail.com>
Date: Wed, 24 Nov 2010 14:15:08 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~393
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=78c8c5ce2c81599cde866c96db13ef896c691387;p=xonotic%2Fxonotic-data.pk3dir.git

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

78c8c5ce2c81599cde866c96db13ef896c691387