Bug 777428 - Make it possible to debug webapps running in desktop webapp runtime. r=past
Bug 912301 - Exit fullscreen mode if the user navigates to an off-origin url. r=myk
Bug 892240 - Add tests for trimming and formatting of the URI r=jimm,sfoster

--HG--
extra : rebase_source : 4decf908068c2ca35514b87a619480327d50bb8e
Bug 912590 - Part 1: Update base tests to use new Robotium 4.2 APIs for View fetching. r=gbrown
Bug 912510 - Part 2: Update base tests to use Conditions. r=gbrown
Bug 767313 - Merge the Tabs category into the General category in in-content preferences. r=Unfocused
Bug 911146 - Add nsIAppStartup attribute to tell whether the app was restarted; r=bsmedberg
Bug 906134 - Fix downloads' startTime serialization. r=paolo
Bug 906134 - Implement tests for the DownloadImport module. r=paolo
Backed out changeset 4c2ec5c33ea9 (bug 911146)
Bug 910563 - gracefully handle the thumbnail process crashing.  r=adw
Backed out changesets 28df44ca24f3, 6a5406d79364 (bug 906134) for m-bc bustage
Bug 899908 - remove ability for a social worker to reload and reconnect ports.  r=mixedpuppy
merge fx-team to mozilla-central