final fixes
Merge branch 'multiple-track-year-disc-fix' of github.com:Narfinger/Clementine into multiple-track-year-disc-fix

Conflicts:
	src/widgets/lineedit.cpp