saltstack/salt — pull request #2889 by borgstrom (2012-12-13 18:51:53+00:00)
Title: Undo my changes in 747ee9 because of the changes in bc77261

See discussion and comments on 747ee9 for more info.