opscode/chef — pull request #1486 by mcquin (2014-06-11 23:54:40+00:00)
Title: update for merges

just a few today...