]> git.xonotic.org Git - xonotic/xonstatdb.git/commitdiff
projects / xonotic / xonstatdb.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3a58f8 202c53a)
Merge branch 'master' of github.com:antzucaro/xonstatdb
authorantzucaro <azucaro@gmail.com>
Wed, 2 Jan 2013 16:47:59 +0000 (11:47 -0500)
committerantzucaro <azucaro@gmail.com>
Wed, 2 Jan 2013 16:47:59 +0000 (11:47 -0500)

Trivial merge