From: Mirio <opivy@hotmail.de>
Date: Fri, 10 Mar 2017 20:19:03 +0000 (+0100)
Subject: Merge branch 'master' into t0uYK8Ne/finalrage
X-Git-Tag: xonotic-v0.8.2~81^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F69%2Fhead;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into t0uYK8Ne/finalrage
---

5f1bee747045ca71f27dee3626f134a0bc96bd25