puppetlabs/puppetlabs-openstack_dev_env — pull request #8 by bodepd (2012-10-24 02:23:26+00:00)
Title: update Puppetfile

resolves a merge conflict.