Merge remote branch 'refs/remotes/origin/fruitiex/branding'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 07:25:26 +0000 (09:25 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 07:25:26 +0000 (09:25 +0200)

Trivial merge