From: Mirio <opivy@hotmail.de>
Date: Thu, 30 Nov 2017 18:41:26 +0000 (+0000)
Subject: Merge branch 'Mirio/boil' into 'master'
X-Git-Tag: xonotic-v0.8.5~145
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db6ca2c6975b623df2ae3e460d3a372437d1ec5e;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/boil' into 'master'

Mirio/boil

Closes #139

See merge request xonotic/xonotic-maps.pk3dir!109
---

db6ca2c6975b623df2ae3e460d3a372437d1ec5e