Commit Graph

3 Commits

Author SHA1 Message Date
Eric Lippmann 87c5af7df9 Merge branch 'master' into feature/deduplicate-puppet-code-6842 2014-12-15 18:03:38 +01:00
Eric Lippmann 31a05c90a3 Merge branch 'master' into feature/deduplicate-puppet-code-6842 2014-12-15 12:37:10 +01:00
Eric Lippmann 4e8595f0c5 puppet: Rename .vagrant-puppet to .puppet 2014-12-10 16:02:54 +01:00