Updated vdr-epg2vdr (git)
Merge branch 'master' into next

Conflicts:
	plugins/vdr-epg2vdr/PKGBUILD