saltstack/salt — pull request #14157 by rominf (2014-07-12 15:00:23+00:00)
Title: Merge pull request #1 from saltstack/develop

Update upstream