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

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

a0f8261f12a1a8b073066e06622834cad1a06c65