From: Ant Zucaro <azucaro@gmail.com>
Date: Sun, 17 Sep 2017 15:27:39 +0000 (-0400)
Subject: Fix merge conflict.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F6%2Fhead;p=xonotic%2Fxonstat.git

Fix merge conflict.
---

46766ab3e13c8265330047224d6bb823d5d4aaf1