Merge branch 'master' into zykure/approved
authorJan Behrens <zykure@web.de>
Fri, 19 Jul 2013 07:34:24 +0000 (09:34 +0200)
committerJan Behrens <zykure@web.de>
Fri, 19 Jul 2013 07:34:24 +0000 (09:34 +0200)
commitc4c8ee1cbe0851d7d23dbb6b8aa25e8ecd5f3ee8
tree6d03ddfc37c3399544f56757970802e81f3576a4
parent23f78a5115347c5d8c43832155a1e863dcc16f94
parent6397074df7859101b0c546085201982d67efd441
Merge branch 'master' into zykure/approved

Conflicts:
xonstat/static/css/app.min.css
xonstat/static/css/app.css
xonstat/templates/game_info.mako