From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 27 Feb 2017 13:26: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=345c3becf8c0e3b4a784d25726f4fcf7143622d4;p=xonotic%2Fxonotic.wiki.git

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

345c3becf8c0e3b4a784d25726f4fcf7143622d4