Charles Hooper 2b090320be Merge remote-tracking branch 'upstream/master' into vagrant11-providers ... Conflicts: puppet/modules/docker/manifests/init.pp		2013-03-27 01:09:22 +00:00
..
manifests	initial Vagrant & Puppet setup under Quantal64.	2013-02-03 22:02:41 -08:00
modules/docker	Merge remote-tracking branch 'upstream/master' into vagrant11-providers	2013-03-27 01:09:22 +00:00