From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 3 Oct 2015 06:11:23 +0000 (+1000)
Subject: Merge branch 'master' into TimePath/effectinfo
X-Git-Tag: xonotic-v0.8.2~1887^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96e1acc3050bcb718e2f06702e5b88a60459a015;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/effectinfo
---

96e1acc3050bcb718e2f06702e5b88a60459a015