Merge branch 'master' into i18n

Conflicts:
	plugins/gtkui/interface.c

1 files changed, 3 insertions, 0 deletions

diff --git a/playlist.c b/playlist.c
index cbe4555f..c48514c9 100644
--- a/playlist.c
+++ b/playlist.c
@@ -2478,6 +2478,9 @@ pl_format_title (playItem_t *it, int idx, char *s, int size, int id, const char
             else if (*fmt == 'B') {
                 meta = pl_find_meta (it, "band");
             }
+            else if (*fmt == 'C') {
+                meta = pl_find_meta (it, "composer");
+            }
             else if (*fmt == 'n') {
                 meta = pl_find_meta (it, "track");
             }