From: sev <sev.ch@web.de>
Date: Wed, 30 Mar 2011 20:31:39 +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~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4399325756e6aced160db62e985268a3dd5e4282;p=xonotic%2Fxonotic-data.pk3dir.git

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

4399325756e6aced160db62e985268a3dd5e4282