]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db7c9b5 b95145d)
Merge branch 'master' into badges
authorJan D. Behrens <zykure@web.de>
Sun, 16 Sep 2012 20:26:00 +0000 (22:26 +0200)
committerJan D. Behrens <zykure@web.de>
Sun, 16 Sep 2012 20:26:00 +0000 (22:26 +0200)

Trivial merge