Merge branch 'master' into approved
authorJan Behrens <zykure@web.de>
Fri, 11 Jan 2013 16:39:54 +0000 (17:39 +0100)
committerJan Behrens <zykure@web.de>
Fri, 11 Jan 2013 16:39:54 +0000 (17:39 +0100)
commitc9a891fdb40cdcf72d75e23c5f5565a30ffd4c84
tree40f529b12459f1de2584b9e3dfaa1db2a970b585
parent46e8449ef380112977c35dbb5f2c790a36bc78f4
parent78668e118230fa0cc372d414cb36c1dd97e59a84
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