From: Mario <zacjardine@y7mail.com>
Date: Thu, 25 Dec 2014 10:36:22 +0000 (+1100)
Subject: Merge branch 'master' into terencehill/music_player
X-Git-Tag: xonotic-v0.8.1~157^2~4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=3f2caafc69a1f64fc52e2e763c9f73989bac558d

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

3f2caafc69a1f64fc52e2e763c9f73989bac558d