2014-03-27 - releng
13:58	<hashar>	rebased puppetmaster git repository, reapplied ottomata live hacks.	[releng]