From: terencehill <piuntn@gmail.com>
Date: Tue, 4 Jan 2011 20:29:58 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~328
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f51d925a0faf39beb5debb7daefdf6c519e61cb3;p=xonotic%2Fxonotic-data.pk3dir.git

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

f51d925a0faf39beb5debb7daefdf6c519e61cb3