2016-10-24 - releng
09:14	<hashar>	rebasing integration puppet master	[releng]