From: Mirio <opivy@hotmail.de>
Date: Wed, 15 Mar 2017 19:05:16 +0000 (+0000)
Subject: Merge branch 'packer/runningman-alignment' into 'master'
X-Git-Tag: xonotic-v0.8.2~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9a0b32267f37461e109b24d343f26676f508843;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'packer/runningman-alignment' into 'master'

packer/runningman-alignment

See merge request !84
---

a9a0b32267f37461e109b24d343f26676f508843