From: terencehill <piuntn@gmail.com>
Date: Fri, 12 Nov 2010 22:19:23 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~420
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4598f224d52aa8485c3ae0ecd40a12bc2cfbf8c8;p=xonotic%2Fxonotic-data.pk3dir.git

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

4598f224d52aa8485c3ae0ecd40a12bc2cfbf8c8