From: Jan D. Behrens <zykure@web.de>
Date: Fri, 28 Sep 2012 20:20:00 +0000 (+0200)
Subject: Merge branch 'master' into pickupbot
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fb97c6a0fd21b56f463da8b922ff22685b558673;p=xonotic%2Fxonstat.git

Merge branch 'master' into pickupbot

Conflicts:
	xonstat/views/player.py
---

fb97c6a0fd21b56f463da8b922ff22685b558673