From: antzucaro <azucaro@gmail.com>
Date: Wed, 2 Jan 2013 16:47:59 +0000 (-0500)
Subject: Merge branch 'master' of github.com:antzucaro/xonstatdb
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f5016618462ab2cc3b32744e52006f17a0ca7b5;p=xonotic%2Fxonstatdb.git

Merge branch 'master' of github.com:antzucaro/xonstatdb
---

0f5016618462ab2cc3b32744e52006f17a0ca7b5