From: terencehill <piuntn@gmail.com>
Date: Sun, 10 Oct 2010 19:57:37 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~267^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc32d8e4288a70b77c61208820e93d3fad56fcdf;p=xonotic%2Fxonotic-data.pk3dir.git

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

cc32d8e4288a70b77c61208820e93d3fad56fcdf