2014-08-27 - releng
14:59	<bd808>	Resolved puppet git merge conflict on deployment-salt	[releng]