From: Mirio <opivy@hotmail.de>
Date: Tue, 5 May 2015 12:14:27 +0000 (+0200)
Subject: Merge branch 'master' into debugger/shadow/atelier
X-Git-Tag: xonotic-v0.8.1~9^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c663244c553a6d6878d4997957f170f2424d33ff;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into debugger/shadow/atelier
---

c663244c553a6d6878d4997957f170f2424d33ff