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

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

b9a9e2388087db58cb5b81d882d711f4ac3e2ded