saltstack/salt — pull request #18959 by thatch45 (2014-12-12 17:39:25+00:00)
Title: fix zip_file shadowing per #18933

fix zip_file shadowing per #18933