Merge branch 'master' into 1.0.x

puppetlabs · Feb 20, 2014 · 1f6e2a8 · 1f6e2a8
2 parents fe25900 + f44ca04
commit 1f6e2a8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ spec/fixtures/manifests/
 .ruby-version
 .rspec_system
 .bundle
+.vagrant
 vendor/