2015-06-29 - releng
10:43	<hashar>	manually rebasing integration-puppetmaster git repo	[releng]