Merge branch 'master' into zykure/approved
authorJan Behrens <zykure@web.de>
Sat, 20 Apr 2013 09:47:05 +0000 (11:47 +0200)
committerJan Behrens <zykure@web.de>
Sat, 20 Apr 2013 09:47:05 +0000 (11:47 +0200)
commit75e7a7632daf429eb04b102c2710967553dd6ad1
tree2365d68208e420ddb4d48608e86b0c19521ca749
parent32356c003bff25d823938904d6b6577c2dc0b973
parentd16882bddf4da58caa6bc9e1d6b423fe4152fd1f
Merge branch 'master' into zykure/approved

Conflicts:
xonstat/templates/player_game_index.mako
xonstat/templates/main_index.mako
xonstat/templates/player_game_index.mako