From: Jan Behrens <zykure@web.de>
Date: Fri, 11 Jan 2013 16:39:54 +0000 (+0100)
Subject: Merge branch 'master' into approved
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c9a891fdb40cdcf72d75e23c5f5565a30ffd4c84;p=xonotic%2Fxonstat.git

Merge branch 'master' into approved

Conflicts:
	xonstat/__init__.py
	xonstat/templates/player_game_index.mako
	xonstat/views/__init__.py
	xonstat/views/helpers.py
	xonstat/views/player.py
---

c9a891fdb40cdcf72d75e23c5f5565a30ffd4c84