From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Mon, 23 Sep 2013 15:18:51 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/hudsetup
X-Git-Tag: xonotic-v0.8.1~94^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=903610018ac85cfa04e1e7072f7efdbd9c4e0413;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into matthiaskrgr/hudsetup
---

903610018ac85cfa04e1e7072f7efdbd9c4e0413