Merge remote branch 'origin/master' into divVerent/courtfun2
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 24 Jul 2011 20:35:21 +0000 (22:35 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 24 Jul 2011 20:35:21 +0000 (22:35 +0200)

Trivial merge