Merge branch 'master' into zykure/approved
authorJan Behrens <zykure@web.de>
Thu, 18 Apr 2013 15:13:39 +0000 (17:13 +0200)
committerJan Behrens <zykure@web.de>
Thu, 18 Apr 2013 15:13:39 +0000 (17:13 +0200)
commit82f90469bf71496c6e639da83af04488e0979b16
treedb093d4bc6bd40cd34ed18d4ca6c7134882cece4
parent4489ed57dc1eb34146183f93ba763e133c466364
parent4d8d3afb2f14b6573fbd988ea1fe9a0920e9cacf
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/models.py
xonstat/static/css/app.css
xonstat/static/css/app.min.css
xonstat/templates/main_index.mako
xonstat/templates/player_index.mako
xonstat/templates/player_info.mako