saltstack/salt — pull request #6977 by s0undt3ch (2013-08-31 20:56:27+00:00)
Title: 0.16 merge

@basepi, the big one will come latter.