Merge branch 'experimental' of git://git.musicpd.org/metyl/mpd

Conflicts:

	configure.ac
	src/ls.h
	src/output/shout_plugin.c

src/ls.h

@@ -20,6 +20,7 @@
 #define MPD_LS_H
 
 #include "decoder_list.h"
+#include "archive_list.h"
 
 #include <stdbool.h>
 
@@ -39,6 +40,9 @@ bool isRemoteUrl(const char *url);
 const struct decoder_plugin *
 hasMusicSuffix(const char *utf8file, unsigned int next);
 
+const struct archive_plugin *
+get_archive_by_suffix(const char *utf8file);
+
 void printRemoteUrlHandlers(struct client *client);
 
 #endif