From: Mario <zacjardine@y7mail.com>
Date: Fri, 3 Apr 2015 10:11:14 +0000 (+1100)
Subject: Merge branch 'matthiaskrgr/hudsetup'
X-Git-Tag: xonotic-v0.8.1~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1462e4cf8e347cbec1ba3a3cf82b1bf849b7d8a2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/hudsetup'
---

1462e4cf8e347cbec1ba3a3cf82b1bf849b7d8a2