From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 15 Nov 2010 20:52:52 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/fruitcampaign'
X-Git-Tag: xonotic-v0.1.0preview~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b8113ca3ff4843a16c3546114fc3d9ce819fe66;p=xonotic%2Fxonotic-maps.pk3dir.git

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

1b8113ca3ff4843a16c3546114fc3d9ce819fe66