2015-07-01 - releng
10:29	<hashar>	rebased puppet.git on integration-puppetmaster. Autoupdater was blocked by a couple 3-way merges.	[releng]