]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57e5611 4470959)
Merge remote-tracking branch 'antzucaro/master'
authornyov <nyov@nexnode.net>
Sun, 6 May 2012 02:23:21 +0000 (04:23 +0200)
committernyov <nyov@nexnode.net>
Sun, 6 May 2012 02:23:21 +0000 (04:23 +0200)

Trivial merge