Merge remote branch 'refs/remotes/origin/fruitiex/gakarmor'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 09:52:00 +0000 (11:52 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 09:52:00 +0000 (11:52 +0200)

Trivial merge