From: terencehill <piuntn@gmail.com>
Date: Thu, 12 May 2011 20:14:28 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~262^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c52282ec6b0a0e7e0a2c0f4ba634b4fac47f4c2f;p=xonotic%2Fxonotic-data.pk3dir.git

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

c52282ec6b0a0e7e0a2c0f4ba634b4fac47f4c2f