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

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

d26fd5c4818aeda4dde14b1e18d9ab6e0baaf9e4