From: Ant Zucaro <azucaro@gmail.com>
Date: Tue, 23 Apr 2013 02:26:12 +0000 (-0400)
Subject: Merge branch 'zykure-approved'
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonstat.git;a=commitdiff_plain;h=5d1a78293f44986ae007f9098a2b00082dc4153f

Merge branch 'zykure-approved'
---

5d1a78293f44986ae007f9098a2b00082dc4153f