From: FruitieX <rasse@rasse-laptop.(none)>
Date: Thu, 21 Oct 2010 20:17:04 +0000 (+0300)
Subject: Merge branch 'master' into terencehill/newpanelhud-dom_points
X-Git-Tag: xonotic-v0.5.0~348^2~6^2~2^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0b2b94b02edc3a3af4a7eb7402fc0c46d506fd9b;p=xonotic%2Fxonotic-data.pk3dir.git

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

0b2b94b02edc3a3af4a7eb7402fc0c46d506fd9b