]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcb0776 fb97c6a)
Merge branch 'pickupbot' into approved
authorJan D. Behrens <zykure@web.de>
Fri, 28 Sep 2012 20:20:17 +0000 (22:20 +0200)
committerJan D. Behrens <zykure@web.de>
Fri, 28 Sep 2012 20:20:17 +0000 (22:20 +0200)

Trivial merge