2015-05-27 - releng
14:30	<hashar>	manually rebasing puppet git on deployment-salt (stalled)	[releng]