2014-08-14 - releng
12:23	<hashar>	manually rebased operations/puppet.git on puppetmaster	[releng]