From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 May 2013 15:58:32 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/campaign'
X-Git-Tag: xonotic-v0.7.0~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=299db29603da98e316e9f189e6fa1d0334ad400e;p=xonotic%2Fxonotic-maps.pk3dir.git

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

299db29603da98e316e9f189e6fa1d0334ad400e