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)
commit970e6c1454dd92c2fd71b4869abd3a471ba68eea
tree60ba24af8246ec2c4030ab914cd105536fb9b906
parent535736b42466b8d3c0922beac08debcd53d0590e
parent5764a546c4ad8680e37f49ea1f53943f2cf0d187
Merge remote branch 'origin/fruitiex/dryfirefix'