Merge branch 'mk/strset' into mk/playlist

* mk/strset:
  use strset.h instead of tagTracker.h
  strset: fix duplicate values
  added string set library

Conflicts:
	src/dbUtils.c
	src/tagTracker.c

1 files changed, 0 insertions, 1 deletions

diff --git a/src/tag.c b/src/tag.c
index e5c306eb4..f1acb7c79 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -23,7 +23,6 @@
 #include "utf8.h"
 #include "log.h"
 #include "conf.h"
-#include "tagTracker.h"
 #include "song.h"
 
 /**