2016-02-11 - deployment-prep
15:15	<gehel>	fixed deployment-puppetmaster rebase conflict by removing commit 814f12bc - author is informed	[deployment-prep]