From: sev <sev.ch@web.de>
Date: Wed, 30 Mar 2011 20:26:58 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
X-Git-Tag: xonotic-v0.5.0~305^2~14^2~3
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=71517acc37c758a19401211ebb478707dd19357a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
---

71517acc37c758a19401211ebb478707dd19357a