Add test for bug 880377 rs=tests
Bug 892765 - part 1 - move common captivedetect test code into head_setprefs.js; r=schien
Bug 892765 - part 2 - rewrite captivedetect tests in terms of run_captivedetect_test; r=schien
Bug 892765 - part 3 - run captivedetect test http server on OS-determined port; r=schien
Backed out changeset bf423f63b3a1 (bug 885107)
Backed out changeset e12c6f7d6676 (bug 885107) on suspicion of causing bug 894952
Bug 889787 - Define XP_LINUX globally; r=ted
Backed out changeset f713a828fe36 (bug 894931) since the backout it performed was already landed on mozilla-central (and wasn't identical)
Merge mozilla-central and inbound
Bug 893434 - OdinMonkey: make accessing non-data properties a link-time validation error (r=bbouvier)

--HG--
extra : rebase_source : 5b827256536c16d9e2da15e9877efcf393e1a9ef
Bug 895015 - OdinMonkey: make asm.js entries show up builtin FF profiler (r=bbouvier)

--HG--
extra : rebase_source : b6b5391a1b39b3abeb0f194bfa4ca4a9f54ce90f
Bug 875937 - App bar pin tile icon refreshes after it is displayed instead of before. r=mbrubeck
Bug 895083 - Don't #define NS_HAVE_STDCALL on Win64 because __stdcall will just get ignored there by the compiler. r=vlad
Bug 895238 - Avoid using perl regex with grep(1) for portability. r=glandium
Bug 879113 - Part 2: Start screen should handle error cases when missing favicons, thumbnails gracefully. r=sfoster
Bug 885054 - Sidebars should not migrate across private / non-private window. r=gavin
Bug 886508 - Work around Google gesture keyboard quirk. r=cpeterson
Bug 894979 - Serve tests from different origins. r=myk
Bug 892121 - Every xpcshell test should get its own plugins dir. r=gbrown, r=ted
Bug 844642 - Telemetry opt in and out in Firefox Options. r=tabraldes