2016-03-21 - releng
11:13	<hashar>	beta: rebased puppet master which had a conflict on https://gerrit.wikimedia.org/r/#/c/274711/ which got merged meanwhile (saves Elukey )	[releng]