saltstack/salt — pull request #12524 by rchrd (2014-05-04 13:43:20+00:00)
Title: Fixed merging options dict

Fixes issue #12523