From: Mario <zacjardine@y7mail.com>
Date: Mon, 27 Nov 2017 01:29:57 +0000 (+0000)
Subject: Merge branch 'Mario/target_teleporter_v2' into 'master'
X-Git-Tag: xonotic-v0.8.5~2421
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=5c9f51cd3a9f0b63733ee7b81649e81872a86765

Merge branch 'Mario/target_teleporter_v2' into 'master'

Merge branch Mario/target_teleporter_v2 (S merge request)

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

5c9f51cd3a9f0b63733ee7b81649e81872a86765