2015-06-16 - releng
15:55	<bd808>	Resolved rebase conflicts on deployment-salt caused by code review changes of https://gerrit.wikimedia.org/r/#/c/216325 prior to merge	[releng]