Merge branch 'master' into divVerent/simplified-sound-sliders
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 12 Jun 2013 11:53:50 +0000 (13:53 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 12 Jun 2013 11:53:50 +0000 (13:53 +0200)

Trivial merge