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)
commitc0733362df371267ffba2b1a9d036f647232d002
treea8c51f5047563182346a08955d9edf7a50d005f1
parente92090233c3167fc3c8845ebdd5bb903435e5c7d
parent4cb0a1b3be41f16e144caa2a02d80e86c9314bed
Merge branch 'master' of de.git.xonotic.org/xonotic/xonotic.wiki