Merge branch 'master' of ssh://gitlab.com/xonotic/mediasource xonotic-v0.8.2
authorMario <mario.mario@y7mail.com>
Fri, 31 Mar 2017 19:43:19 +0000 (05:43 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 31 Mar 2017 19:43:19 +0000 (05:43 +1000)

Trivial merge