Merge remote branch 'origin/fruitiex/stormkeep'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 23:58:18 +0000 (00:58 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 23:58:18 +0000 (00:58 +0100)

Trivial merge