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

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

1039495b9bdc262055b315f60f49167bd300b13b