2014-07-01 - releng
15:46	<bd808>	Fixed git rebase conflict in operations/puppet on deployment-salt	[releng]