Updated epgd (0.1.12)
Updated vdr-epg2vdr (0.1.7)
Merge branch 'master' into next

Conflicts:
	plugins/vdr-epg2vdr/PKGBUILD