From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 9 Dec 2010 20:05:52 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/campaigntweak'
X-Git-Tag: xonotic-v0.1.0preview~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=574aab22d8b99ab7121b611ab1eed163b9f51320;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/fruitiex/campaigntweak'
---

574aab22d8b99ab7121b611ab1eed163b9f51320