From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 31 Mar 2011 07:25:44 +0000 (+0200)
Subject: Merge remote branch 'origin/sev/hudlayout'
X-Git-Tag: xonotic-v0.5.0~305^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b21e75636f5acaa86118b58e399987b5d0db750e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/sev/hudlayout'
---

b21e75636f5acaa86118b58e399987b5d0db750e