]> git.donarmstrong.com Git - dsa-puppet.git/commit
fix merge
authorPeter Palfrader <peter@palfrader.org>
Wed, 19 Dec 2012 21:40:01 +0000 (22:40 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 19 Dec 2012 21:40:01 +0000 (22:40 +0100)
commit240fde18cdaf875ae932be98f0e4b672d3a41d9e
tree02476e89664827ba9b9ccd7c105f0ee2461306bf
parent927f9ca9bed8928ea91ba1a599857c483ae4994e
fix merge
modules/roles/manifests/static_source.pp