From: Mirio <opivy@hotmail.de>
Date: Wed, 15 Mar 2017 10:06:32 +0000 (+0000)
Subject: Merge branch 't0uYK8Ne/oilrig' into 'master'
X-Git-Tag: xonotic-v0.8.2~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b38ec36e49c1a3554ee2ffb3c4f9b1976d132c08;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 't0uYK8Ne/oilrig' into 'master'

t0uYK8Ne/oilrig

Closes #129

See merge request !82
---

b38ec36e49c1a3554ee2ffb3c4f9b1976d132c08