- cli.cli: pep8-ified code
Merge branch 'section-without-proto' of https://github.com/nijel/osc2
Merge branch 'sr-description' of https://github.com/nijel/osc2