From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 01:35:05 +0000 (+1100)
Subject: Merge branch 'nyov/combined_updates/effects'
X-Git-Tag: xonotic-v0.8.0~139
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0b50c5b420fff105059d69ce49b5e2774c3170d9

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

0b50c5b420fff105059d69ce49b5e2774c3170d9