From: Mirio <opivy@hotmail.de>
Date: Fri, 3 Mar 2017 16:20:48 +0000 (+0000)
Subject: Merge branch 'kuniuthefrogg/boil' into 'master'
X-Git-Tag: xonotic-v0.8.2~102
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=54664384ca59c62ffcf34c631073a4db76b6880c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'kuniuthefrogg/boil' into 'master'

kuniuthefrogg/boil

See merge request !58
---

54664384ca59c62ffcf34c631073a4db76b6880c