From: Martin Taibr <taibr.martin@gmail.com>
Date: Fri, 10 Feb 2017 00:22:34 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1f037f2bf1accea3caf1ec75aec01c01175f25b;p=xonotic%2Fxonotic.wiki.git

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

b1f037f2bf1accea3caf1ec75aec01c01175f25b