From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 7 Dec 2010 10:08:31 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/campaign'
X-Git-Tag: xonotic-v0.1.0preview~69
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fea194bd6a4ad1d3012998f7ba20f3a5c123d171;p=xonotic%2Fxonotic-data.pk3dir.git

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

fea194bd6a4ad1d3012998f7ba20f3a5c123d171