From: Mario <zacjardine@y7mail.com>
Date: Thu, 11 Dec 2014 23:42:19 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/Mirio/campaign'
X-Git-Tag: xonotic-v0.8.0~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=745b8e7bec307fce6db5a17d547bf7ef8745af9c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/campaign'
---

745b8e7bec307fce6db5a17d547bf7ef8745af9c