From: terencehill <piuntn@gmail.com>
Date: Fri, 31 Dec 2010 11:27:18 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~330
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81fd06082f4878a126140befaa404427b264724b;p=xonotic%2Fxonotic-data.pk3dir.git

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

81fd06082f4878a126140befaa404427b264724b