2015-02-18 - releng
01:41	<bd808>	fixed git rebase conflict on deployment-salt caused by outdated cherry-pick; cherry-picks are merged now so reset to tracking origin/production	[releng]