]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 249af7a 136e7ba)
Merge branch 'pickupbot' into approved
authorJan D. Behrens <zykure@web.de>
Mon, 24 Sep 2012 18:46:33 +0000 (20:46 +0200)
committerJan D. Behrens <zykure@web.de>
Mon, 24 Sep 2012 18:46:33 +0000 (20:46 +0200)

Trivial merge