From: terencehill <piuntn@gmail.com>
Date: Mon, 12 Dec 2011 12:32:24 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/hud_skin_files_sync
X-Git-Tag: xonotic-v0.6.0~188^2~26^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0656e9a6b660e95a04cc8ced4e73b76d19f5c3a;p=xonotic%2Fxonotic-data.pk3dir.git

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

c0656e9a6b660e95a04cc8ced4e73b76d19f5c3a