Merge branch 'approved' of gitorious.org:xonotic/xonstat into approved
authorJan Behrens <zykure@web.de>
Wed, 16 Jan 2013 18:47:01 +0000 (19:47 +0100)
committerJan Behrens <zykure@web.de>
Wed, 16 Jan 2013 18:47:01 +0000 (19:47 +0100)
commitb54d17713c272d715bb90029b77adaf9d482dc9e
tree8d3562c6936f6422a91eccbf2dd94b0aaf3031a6
parent51cb9c393c6c612c4f4cd1e20b62e727986c78e3
parentc9a891fdb40cdcf72d75e23c5f5565a30ffd4c84
Merge branch 'approved' of gitorious.org:xonotic/xonstat into approved