saltstack/salt — pull request #13117 by cachedout (2014-05-29 16:21:05+00:00)
Title: Cache fix backport

Backported for 2014.1