From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Mon, 27 Jun 2016 01:31:17 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/quad_blue
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c21d7bb9d4f0b5f0cf78152f4baffc4b41e4bfb5;p=xonotic%2Fxonotic-data.pk3dir.git

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

c21d7bb9d4f0b5f0cf78152f4baffc4b41e4bfb5