Merge branch 'chaot4-feature_include_more_options_in_help'
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 25 Nov 2015 22:32:56 +0000 (17:32 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 25 Nov 2015 22:32:56 +0000 (17:32 -0500)

Trivial merge