]> git.rm.cloudns.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b091f1 74aeff6)
Merge branch 'master' into zykure/approved
authorJan Behrens <zykure@web.de>
Tue, 16 Apr 2013 15:42:49 +0000 (17:42 +0200)
committerJan Behrens <zykure@web.de>
Tue, 16 Apr 2013 15:42:49 +0000 (17:42 +0200)

Trivial merge