saltstack/salt — pull request #8806 by UtahDave (2013-11-25 16:58:09+00:00)
Title: Don't define __opts__ and __pillar__ in the module

Also shorten a line