From: terencehill <piuntn@gmail.com>
Date: Fri, 13 Aug 2010 20:25:53 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/newpanelhud-dom_points
X-Git-Tag: xonotic-v0.5.0~348^2~6^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f6d5d5e608f65e86953bd0698a7af985de45b94;p=xonotic%2Fxonotic-data.pk3dir.git

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

1f6d5d5e608f65e86953bd0698a7af985de45b94