saltstack/salt — pull request #6143 by s0undt3ch (2013-07-13 17:47:59+00:00)
Title: Fix Issue #6129 unexpected `__env__`  keyword

Re-implement 06ac67c the right way since the state `__env__` was being confused by the shell environment.