Merge branch 'master' into zykure/wip
authorJan Behrens <zykure@web.de>
Sat, 17 Aug 2013 10:40:08 +0000 (12:40 +0200)
committerJan Behrens <zykure@web.de>
Sat, 17 Aug 2013 10:40:08 +0000 (12:40 +0200)
commit51c42763989fcd89c3d213b897773005ce02c7b7
tree52c4d1314cd2d0aff055803d7bd205b495b7e067
parent02190a484fd2bcffc6571f766fca22385b281d48
parentdd00747378b4c9f9833bc01f75137cbb4f3511d9
Merge branch 'master' into zykure/wip

Conflicts:
xonstat/static/css/app.css
xonstat/static/css/app.min.css
xonstat/templates/game_info.mako
xonstat/templates/scoreboard.mako
xonstat/views/submission.py
xonstat/views/game.py