From: terencehill <piuntn@gmail.com>
Date: Tue, 30 Dec 2014 23:42:33 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/music_player
X-Git-Tag: xonotic-v0.8.1~157^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2979f977d8f1f9c20f68447b672bc7fb732a2f5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/music_player
---

c2979f977d8f1f9c20f68447b672bc7fb732a2f5