From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sun, 14 Nov 2010 18:46:09 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/dryfirefix'
X-Git-Tag: xonotic-v0.1.0preview~139^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=970e6c1454dd92c2fd71b4869abd3a471ba68eea;p=xonotic%2Fxonotic-data.pk3dir.git

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

970e6c1454dd92c2fd71b4869abd3a471ba68eea