summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jacob <adam@opscode.com>2009-06-07 16:25:35 -0700
committerAdam Jacob <adam@opscode.com>2009-06-07 16:25:35 -0700
commit4d6fbcca57efaf7421e6d3bd019a3a6b658e4782 (patch)
treebbc6797fd0b69fc2ac6e27acd46c11b65e70f248
parentf352407140fa2d8ecd90035952fac8f1e6a0c4cc (diff)
parent30a5d8e973c58b9b61cb4b6960f6200603e8a6f0 (diff)
downloadchef-4d6fbcca57efaf7421e6d3bd019a3a6b658e4782.tar.gz
Merge branch 'master' into jtimberman/chef-342
0 files changed, 0 insertions, 0 deletions