2014-06-25 - releng
20:58	<bd808>	Fixed rebase conflict in operations/puppet.git on deployment-salt caused by cherry-picked vcl patch left over from varnish submodule usage	[releng]