From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 01:34:08 +0000 (+1100)
Subject: Merge branch 'master' into nyov/combined_updates/effects
X-Git-Tag: xonotic-v0.8.0~139^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ea71b9af4bd7c224adc5a2ca93bed80c93930df2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into nyov/combined_updates/effects
---

ea71b9af4bd7c224adc5a2ca93bed80c93930df2