From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 18 Dec 2010 20:16:13 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/campaign'
X-Git-Tag: xonotic-v0.1.0preview~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8932c75afedef04137a3eec5727703dac4aca59b;p=xonotic%2Fxonotic-maps.pk3dir.git

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

8932c75afedef04137a3eec5727703dac4aca59b