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

Merge branch 'master' into Mario/hitsound_pitch
---

dbd6810f2a72d4eecf21a0130724ac2cd02050b3