Merge remote branch 'origin/fruitiex/cuinnton_credits'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 21:33:37 +0000 (22:33 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 21:33:37 +0000 (22:33 +0100)

Trivial merge