From: Mario <mario.mario@y7mail.com>
Date: Tue, 21 Jan 2020 15:29:02 +0000 (+0000)
Subject: Merge branch 'Mario/ipv6_gamelog' into 'master'
X-Git-Tag: xonotic-v0.8.5~1161^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a477264b2997ae2934db7071f77f392e05bf3445;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/ipv6_gamelog' into 'master'

Merge branch Mario/ipv6_gamelog (S merge request)

See merge request xonotic/xonotic-data.pk3dir!765
---

a477264b2997ae2934db7071f77f392e05bf3445