From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 2 Mar 2017 13:03:00 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.wiki.git;a=commitdiff_plain;h=106abc532845a0706845249ea4a3b66c068e2ebb

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

106abc532845a0706845249ea4a3b66c068e2ebb