From: Mario <zacjardine@y7mail.com>
Date: Fri, 28 Jul 2017 22:48:16 +0000 (+0000)
Subject: Merge branch 'martin-t/tutlink' into 'master'
X-Git-Tag: xonotic-v0.8.5~196
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9564d6edd6a095fa12661dafc9929ee1737bce3;p=xonotic%2Fxonotic.git

Merge branch 'martin-t/tutlink' into 'master'

Use shortlink for Halogene's tutorial in tips

See merge request !27
---

a9564d6edd6a095fa12661dafc9929ee1737bce3