Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic.wiki
authorhalogene <halo-gene@freenet.de>
Mon, 9 Nov 2015 14:56:21 +0000 (15:56 +0100)
committerhalogene <halo-gene@freenet.de>
Mon, 9 Nov 2015 14:56:21 +0000 (15:56 +0100)

Trivial merge