From: Mirio <opivy@hotmail.de>
Date: Sat, 4 Mar 2017 15:48:13 +0000 (+0000)
Subject: Merge branch 't0uYK8Ne/fuse' into 'master'
X-Git-Tag: xonotic-v0.8.2~94
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=3b8d1ecc243fc244fea0613aff4684c92202b774;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 't0uYK8Ne/fuse' into 'master'

t0uYK8Ne/fuse

See merge request !65
---

3b8d1ecc243fc244fea0613aff4684c92202b774