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

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

324f75a7211bb3754b45e379f7dc818fa78c221d