From: Mirio <opivy@hotmail.de>
Date: Thu, 9 Jul 2015 19:06:40 +0000 (+0200)
Subject: Merge branch 'master' into amade/finalrage
X-Git-Tag: xonotic-v0.8.1~7^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=d3722ba28503f506b59557f26bb08c8998b35867;hp=-c

Merge branch 'master' into amade/finalrage
---

d3722ba28503f506b59557f26bb08c8998b35867