From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 09:15:15 +0000 (+1100)
Subject: Merge branch 'master' into sev/luma
X-Git-Tag: xonotic-v0.8.1~144^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=170df65904f147f37fae1c1f64aaad2c230854d2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into sev/luma
---

170df65904f147f37fae1c1f64aaad2c230854d2