2014-08-29 - releng
22:39	<bd808>	Fixed a merge conflict in operations/puppet on deployment-salt	[releng]