From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sun, 23 Jun 2013 20:47:53 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/screenshotcmd
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4592d59da60ff2481f7c2cec2037531af01aeb86;p=xonotic%2Fxonotic-data.pk3dir.git

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

4592d59da60ff2481f7c2cec2037531af01aeb86