Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Fri, 24 Jan 2014 16:50:17 +0000 (17:50 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 24 Jan 2014 16:50:17 +0000 (17:50 +0100)

Trivial merge