saltstack/salt — pull request #16561 by cachedout (2014-10-10 22:39:06+00:00)
Title:  Pillar overwrite merge stategy

Refs #16530

This worked for my basic tests. Could use some review.