From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 22 Mar 2017 18:55:22 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/cleanup
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0015bfa8f1aa78080ded738eb82208b82b1982c0;p=xonotic%2Fxonotic.wiki.git

Merge branch 'master' into martin-t/cleanup
---

0015bfa8f1aa78080ded738eb82208b82b1982c0