Merge branch 'master' into zykure/approved
authorJan Behrens <zykure@web.de>
Fri, 19 Apr 2013 16:34:06 +0000 (18:34 +0200)
committerJan Behrens <zykure@web.de>
Fri, 19 Apr 2013 16:34:06 +0000 (18:34 +0200)
commit9303565d7bea5e860578c44559f01a8229ebe2fb
tree014b712e9fe1ff5fe743d17ef17e50da37ae3736
parent263d77a8d3ff1b734a83f70a1f0bd2d6632489c4
parenta12bbd8bbfe624fe2b8617ed463aaa5dc432f6bd
Merge branch 'master' into zykure/approved

Conflicts:
xonstat/static/css/app.css
xonstat/static/css/app.min.css
xonstat/templates/main_index.mako
xonstat/templates/rank_index.mako
xonstat/static/css/app.css
xonstat/static/css/app.min.css
xonstat/templates/game_index.mako