Merge remote branch 'origin/fruitiex/dryfirefix'
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 14 Nov 2010 18:46:09 +0000 (19:46 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 14 Nov 2010 18:46:09 +0000 (19:46 +0100)

Trivial merge