From: terencehill <piuntn@gmail.com>
Date: Tue, 6 Aug 2013 00:24:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/terencehill/music_player' into terencehill/music... 
X-Git-Tag: xonotic-v0.8.1~157^2~7
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=46227d344e48c3a06cf4a736046103722adb82f2

Merge remote-tracking branch 'origin/terencehill/music_player' into terencehill/music_player

Conflicts:
	qcsrc/menu/xonotic/playlist.c
---

46227d344e48c3a06cf4a736046103722adb82f2