modified:   subliminal/cli.py
	new file:   subliminal/convert.py
Merge branch 'devel-convert' of https://github.com/getzze/subliminal into devel-convert

Conflicts:
	subliminal/convert.py

	modified:   subliminal/convert.py
	modified:   subliminal/convert.py
	modified:   subliminal/convert.py
Merge branch 'devel-convert' into devel