From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Thu, 29 Aug 2013 12:11:26 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/hudsetup
X-Git-Tag: xonotic-v0.8.1~94^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b7830a7a3d15f361d04d3e552dc09162655da2a;p=xonotic%2Fxonotic-data.pk3dir.git

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

1b7830a7a3d15f361d04d3e552dc09162655da2a