use platform-specific path separators so build scripts work on Windows
Bug 856240 - Don't bring TrustedUI opener to background
bug 859105: add an l10n-id attribute to the "Send" button, r=stas
Merge pull request #9144 from fabi1cazenave/sendButton-l12y-bug859105

bug 859105: add an l10n-id attribute to the "Send" button, r=stas
Merge pull request #9083 from alivedise/bugzilla/856240/dont-kill-trustedui

Bug 856240 - Don't bring TrustedUI opener to background, r=timdream, a=blocking-b2g:leo+
Merge pull request #9103 from mykmelez/win-l10n

Bug 858640: use platform-specific path separators so build scripts work on Windows r=@ochameau
Bug 857837 - Enter NCK/CCK/SPCK popup should pop up at boot up if phone is in network/corporate/serviceprovider locked state r=jaoo

Get rid of the setTimeout ack now that Bug 849757 is fixed.

Warning: do not uplift if Bug 849757 is not uplifted.
Backout Bug 858640 for breaking windows builds r=bustage
Bug 861249 - Fixing Contacts unit tests r=rik