]> git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 321dc9d d0bdb7b)
Merge branch 'master' into approved.new
authorJan Behrens <zykure@web.de>
Wed, 16 Jan 2013 18:46:08 +0000 (19:46 +0100)
committerJan Behrens <zykure@web.de>
Wed, 16 Jan 2013 18:46:08 +0000 (19:46 +0100)

Trivial merge