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)
commitd5733e0183d1c8c1683f060645477c0ec1368c6d
treeb8de211393255b41c44352cdb71af03844da7367
parentb14d0f045240849333e2a0ca0702d53c207c76ab
parentdfe149e9fe51cf6dc84bb071bd9c86c19a9574bf
Merge branch 'master' of git.xonotic.org/xonotic/xonstat into approved
xonstat/__init__.py
xonstat/views/__init__.py