From: Ant Zucaro <azucaro@gmail.com>
Date: Thu, 12 Jan 2012 17:49:03 +0000 (-0500)
Subject: Merge conflict fix.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95d2b357c80923a0d9192d218cf26be94dbff134;p=xonotic%2Fxonstat.git

Merge conflict fix.
---

95d2b357c80923a0d9192d218cf26be94dbff134