From: Mirio <opivy@hotmail.de>
Date: Wed, 15 Mar 2017 19:03:47 +0000 (+0000)
Subject: Merge branch 'packer/atelier-nofloodlight' into 'master'
X-Git-Tag: xonotic-v0.8.2~45
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=b0f90bcad287f432234e6dcd555332cdbca14076;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'packer/atelier-nofloodlight' into 'master'

packer/atelier-nofloodlight

See merge request !83
---

b0f90bcad287f432234e6dcd555332cdbca14076