Merge branch 'badges' into approved
authorJan D. Behrens <zykure@web.de>
Sat, 15 Sep 2012 16:45:51 +0000 (18:45 +0200)
committerJan D. Behrens <zykure@web.de>
Sat, 15 Sep 2012 16:45:51 +0000 (18:45 +0200)
commit1a02dc60b8aeb312c2fd8024362224cfbc3ddc7a
tree34a9baf23dd232dc2b44499bbd321402ae1077a4
parentb32454b30219ec8f0354a58733e109f102299aa2
parentb0b58603dd2c2aba312e591dcc339d934931da0c
Merge branch 'badges' into approved

Conflicts:
xonstat/batch/badges/gen_badges.py
xonstat/batch/badges/gen_badges.py
xonstat/templates/base.mako
xonstat/templates/player_info.mako