From: Ant Zucaro <azucaro@gmail.com>
Date: Wed, 5 Sep 2012 02:26:29 +0000 (-0400)
Subject: Merge branch 'badges'
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonstat.git;a=commitdiff_plain;h=5adfb37fd34612e9841123bd90e6fe2c2e9a93ea

Merge branch 'badges'
---

5adfb37fd34612e9841123bd90e6fe2c2e9a93ea