From: Mario <zacjardine@y7mail.com>
Date: Sun, 5 Apr 2015 20:23:21 +0000 (+1000)
Subject: Merge branch 'matthiaskrgr/hudsetup'
X-Git-Tag: xonotic-v0.8.1~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80b29c98079cd8706d09789af8c4d0e77f760e1f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/hudsetup'
---

80b29c98079cd8706d09789af8c4d0e77f760e1f