Updated vdr-skinflatplus
Merge branch 'master' into next

Conflicts:
	plugins/vdr-skinflatplus/PKGBUILD
Updated vdr-hddarchive
Merge branch 'master' into next

Conflicts:
	plugins/vdr-hddarchive/PKGBUILD
Updated vdr-xmltv2vdr
Updated vdr-streamdev
vdr-skinflat: Also use graphicsmagick for skinflat
Merge branch 'master' into next

Conflicts:
	plugins/vdr-skinflat/PKGBUILD
	plugins/vdr-streamdev/PKGBUILD
	plugins/vdr-xmltv2vdr/PKGBUILD
Updated vdr-skinflat
Merge branch 'master' into next

Conflicts:
	plugins/vdr-skinflatplus/PKGBUILD
Fix merge mistake
Fix another merge mistake
vdr-xineliboutput: Fix package error
Merge branch 'master' into next