Improvements to inline help
Merge pull request #615 from fabianofranz/master

Merged by openshift-bot