From: Mario <mario@smbclan.net>
Date: Thu, 12 Nov 2015 10:47:04 +0000 (+1000)
Subject: Merge branch 'Mario/colorbeams_v2'
X-Git-Tag: xonotic-v0.8.2~1674
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a22206c93dcee4c4e45e2c8fccd500965e33680b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/colorbeams_v2'
---

a22206c93dcee4c4e45e2c8fccd500965e33680b