From: halogene <halo-gene@freenet.de>
Date: Mon, 9 Nov 2015 14:56:21 +0000 (+0100)
Subject: Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic.wiki
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0733362df371267ffba2b1a9d036f647232d002;p=xonotic%2Fxonotic.wiki.git

Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic.wiki
---

c0733362df371267ffba2b1a9d036f647232d002