From: nyov <nyov@nexnode.net>
Date: Sun, 6 May 2012 02:23:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'antzucaro/master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9985581d37a9ed1e358d3a30f00bbc21a4167cab;p=xonotic%2Fxonstat.git

Merge remote-tracking branch 'antzucaro/master'
---

9985581d37a9ed1e358d3a30f00bbc21a4167cab