saltstack/salt — pull request #3498 by s0undt3ch (2013-01-29 17:27:02+00:00)
Title: Re-factored cli options merging with the config into it's own mix-in. Refs #2563.

This will be useful in `salt-cloud` which copied this functionality over.