From: Mirio <opivy@hotmail.de>
Date: Mon, 6 Mar 2017 16:22:04 +0000 (+0100)
Subject: Merge branch 't0uYK8Ne/fix-125'
X-Git-Tag: xonotic-v0.8.2~88
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=5a655fb4cb6be8bf73ba577555ae77a04d3d80c9;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 't0uYK8Ne/fix-125'
---

5a655fb4cb6be8bf73ba577555ae77a04d3d80c9