Merge remote-tracking branch 'origin/terencehill/music_player' into terencehill/music...
authorterencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 00:24:47 +0000 (02:24 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 00:24:47 +0000 (02:24 +0200)
Conflicts:
qcsrc/menu/xonotic/playlist.c


Trivial merge