2014-12-18 - releng
13:19	<hashar>	rebased puppetmaster repo	[releng]