saltstack/salt — pull request #7822 by mgwilliams (2013-10-14 19:55:15+00:00)
Title: carbon-returner: make it more flexible

Fixes #7821