Merge branch 'master' into guiplug

Conflicts:
	main.c

1 files changed, 1 insertions, 0 deletions

diff --git a/playlist.c b/playlist.c
index be1b6fc4..a022519e 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1466,6 +1466,7 @@ pl_load (const char *fname) {
                 "comment",
                 "track",
                 "band",
+                "cuesheet",
                 NULL
             };