From: Mirio <opivy@hotmail.de>
Date: Wed, 1 Feb 2017 18:23:53 +0000 (+0000)
Subject: Merge branch 'martin-t/campaign' into 'master'
X-Git-Tag: xonotic-v0.8.2~113
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=166857996eeef3e5cea39f446fc7115e59270fb7;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'martin-t/campaign' into 'master'

Campaign description tweaks

See merge request !60
---

166857996eeef3e5cea39f446fc7115e59270fb7