From: terencehill <piuntn@gmail.com>
Date: Wed, 17 Nov 2010 23:29:38 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~411
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=624fa13007d3628a0f6dc7d7a3557ee20d75f131;p=xonotic%2Fxonotic-data.pk3dir.git

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

624fa13007d3628a0f6dc7d7a3557ee20d75f131