Merge branch 'divVerent/courtfun2'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 25 Jul 2011 05:38:02 +0000 (07:38 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 25 Jul 2011 05:38:02 +0000 (07:38 +0200)

Trivial merge