Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authormerlijn <mhofstra@gmail.com>
Sat, 21 Jul 2012 12:15:52 +0000 (14:15 +0200)
committermerlijn <mhofstra@gmail.com>
Sat, 21 Jul 2012 12:15:52 +0000 (14:15 +0200)

Trivial merge