2014-08-01 - releng
15:02	<bd808>	Cleaned up puppet repo on deployment-salt; merge conflicts with local Ia463120 hack; reapplied depool of deployment-mediawiki01	[releng]