Merge branch 'vobsub2srt' into installed

Conflicts:
	pkgs/tools/cd-dvd/vobsub2srt/default.nix