From: Mario <mario.mario@y7mail.com>
Date: Mon, 15 Feb 2016 01:33:50 +0000 (+1000)
Subject: Merge branch 'Mario/sniperrifle'
X-Git-Tag: xonotic-v0.8.2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8cc2944f3ab18a83178dab37aedce7eb5efc822d;p=xonotic%2Fmediasource.git

Merge branch 'Mario/sniperrifle'
---

8cc2944f3ab18a83178dab37aedce7eb5efc822d