From: Mirio <opivy@hotmail.de>
Date: Thu, 16 Mar 2017 17:55:59 +0000 (+0000)
Subject: Merge branch 'packer/atelier-light-at-mg' into 'master'
X-Git-Tag: xonotic-v0.8.2~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aebef0c63d83f5a7c09850beab0a3de37b1a52eb;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'packer/atelier-light-at-mg' into 'master'

packer/atelier-light-at-mg

See merge request !86
---

aebef0c63d83f5a7c09850beab0a3de37b1a52eb