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

Merge branch 't0uYK8Ne/finalrage' into 'master'

t0uYK8Ne/finalrage

See merge request !69
---

0fc4c8caf37c231b91fbabdb44e030ea20a35f31