From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Dec 2010 20:43:04 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/rifleiconfix'
X-Git-Tag: xonotic-v0.5.0~330^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee483e800d687419bb51097e78883b6b87bf558c;p=xonotic%2Fxonotic-data.pk3dir.git

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

ee483e800d687419bb51097e78883b6b87bf558c