Merge branch 'master' into samual/weapons
authorRudolf Polzer <divverent@xonotic.org>
Mon, 7 Apr 2014 09:25:08 +0000 (11:25 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 7 Apr 2014 09:25:08 +0000 (11:25 +0200)

Trivial merge