Bug 851793 - Use full path to merged dir for l10n - r=armenzg
Bug 833334: forcibly close slave socket in disconnectstep. r=rail

--HG--
extra : rebase_source : 1be717c241c6b1510e0c7ddc79ff62e0f361540d