From: Mario <zacjardine@y7mail.com>
Date: Fri, 28 Jul 2017 21:26:22 +0000 (+0000)
Subject: Merge branch 'Mario/addtolist_cleanup' into 'master'
X-Git-Tag: xonotic-v0.8.5~2556
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f28bafd2da379d00bd179459e73a77620552a66f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/addtolist_cleanup' into 'master'

Merge branch Mario/addtolist_cleanup (XS merge request)

See merge request !452
---

f28bafd2da379d00bd179459e73a77620552a66f