From: Mario <mario@smbclan.net>
Date: Fri, 17 Jun 2016 08:06:43 +0000 (+1000)
Subject: Merge branch 'master' into matthiaskrgr/screenshotcmd
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e64eb040bb832e3f6fe07364271461d1274f958f;p=xonotic%2Fxonotic-data.pk3dir.git

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

e64eb040bb832e3f6fe07364271461d1274f958f