From: Mirio <opivy@hotmail.de>
Date: Tue, 7 Feb 2017 15:56:04 +0000 (+0000)
Subject: Merge branch 'martin-t/campaign2' into 'master'
X-Git-Tag: xonotic-v0.8.2~109
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d912afa0b61ecfed876371420f16f5f810a73f37;p=xonotic%2Fxonotic-maps.pk3dir.git

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

More campaign description fixes

See merge request !61
---

d912afa0b61ecfed876371420f16f5f810a73f37