vdr-live: Rebuild against new tntnet
vdr-upnp: Rebuild against new tntnet
Merge branch 'master' into next

Conflicts:
	plugins/vdr-live/PKGBUILD
	plugins/vdr-upnp/PKGBUILD