Merge branch 'master' of http://git.xonotic.org/xonotic/xonstat into approved
authorJan Behrens <zykure@web.de>
Tue, 22 Jan 2013 16:31:08 +0000 (17:31 +0100)
committerJan Behrens <zykure@web.de>
Tue, 22 Jan 2013 16:31:08 +0000 (17:31 +0100)
1  2 
xonstat/__init__.py
xonstat/views/__init__.py

Simple merge
Simple merge