From: terencehill <piuntn@gmail.com>
Date: Sat, 20 Nov 2010 21:22:51 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~402
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49413c98cec6a272d0c103a85c1f71aad51ee77c;p=xonotic%2Fxonotic-data.pk3dir.git

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

49413c98cec6a272d0c103a85c1f71aad51ee77c