]> de.git.xonotic.org Git - xonotic/xonstat.git/commit
Merge branch 'master' into badges
authorJan D. Behrens <zykure@web.de>
Mon, 27 Aug 2012 22:35:34 +0000 (00:35 +0200)
committerJan D. Behrens <zykure@web.de>
Mon, 27 Aug 2012 22:36:52 +0000 (00:36 +0200)
commite8555dd70abb91613b9089fbd9cf2ce3ef9ee56a
treea1682a5b13333eaddc269f2ec27d9767254dbfda
parent78f7ce51137542307e8cf56bf9bf080f7020b5a1
parent9767d19aeb962d24b99b4330476860b320bd410c
Merge branch 'master' into badges

Conflicts:
xonstat/batch/badges/gen_badges.py
xonstat/batch/badges/gen_badges.py