From: Mario <zacjardine@y7mail.com>
Date: Wed, 4 Feb 2015 02:56:27 +0000 (+0000)
Subject: Merge branch 'sev/luma' into 'master'
X-Git-Tag: xonotic-v0.8.1~6
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=4392e85072ef0b5e87436d607d58fc7ab6af55cb;p=xonotic%2Fmediasource.git

Merge branch 'sev/luma' into 'master'

Luma sourcefiles

Title says it all. Reference: xonotic/xonotic-data.pk3dir!76

See merge request !2
---

4392e85072ef0b5e87436d607d58fc7ab6af55cb