]> git.rm.cloudns.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bd11c0 0001da1)
Merge branch 'master' into pickupbot
authorJan D. Behrens <zykure@web.de>
Fri, 28 Sep 2012 20:20:00 +0000 (22:20 +0200)
committerJan D. Behrens <zykure@web.de>
Fri, 28 Sep 2012 20:20:00 +0000 (22:20 +0200)
Conflicts:
xonstat/views/player.py


Trivial merge