Merge branch 'master' into divVerent/desktopfullscreen
authorRudolf Polzer <divverent@xonotic.org>
Wed, 18 Sep 2013 09:43:20 +0000 (11:43 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 18 Sep 2013 09:43:20 +0000 (11:43 +0200)

Trivial merge