From: terencehill <piuntn@gmail.com>
Date: Fri, 27 Apr 2012 21:49:00 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/music_player
X-Git-Tag: xonotic-v0.8.1~157^2~31
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbb2508f740a7458edb2517369241b40cc02b744;p=xonotic%2Fxonotic-data.pk3dir.git

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

fbb2508f740a7458edb2517369241b40cc02b744