Bug 805338 - Use http://127.0.0.1:1/ as a reliable error page for testing r=jaws
Bug 831393 - send manifestURL in the desktop-notification event. r=vingtetun. a=lsblakk
Bug 828052 - Update Cleopatra and fix the issue with gJavaScriptOnly flag not working; r=past
Bug 496471 - Silence satchel warning about ORDER BY without an index since an index can't be used. r=dolske
Bug 829995 - Ignore case of .url extension when migrating bookmarks from Internet Explorer. r=felipe
Bug 808280 - Remove unused imports from mozconfig.py; r=ted

By preventing the import of pymake, multiprocessing is no longer
imported and BSDs should no longer choke when trying to import it.

DONTBUILD
Merge fx-team with mozilla-central
Bug 831884 - Prevent calling MatchOnly on Win64 as a stopgap. r=dvander
Backout 3b91d62ca343 and 662d0cd47316 for test failures
Bug 832026 - Measure JSRuntime::bumpAlloc_ in the JS memory reporter.  r=sstangl.

--HG--
rename : js/src/tests/lib/jittests.py => js/src/jit-test/jit_test.py
rename : layout/reftests/w3c-css/submitted/values3/calc-background-image-gradient-1-ref.html => layout/reftests/css-calc/background-image-gradient-1-ref.html
rename : layout/reftests/w3c-css/submitted/values3/calc-background-image-gradient-1.html => layout/reftests/css-calc/background-image-gradient-1.html
rename : layout/reftests/w3c-css/submitted/values3/reftest.list => layout/reftests/css-calc/reftest.list
rename : layout/reftests/text/auto-hyphenation-10-ref.html => layout/reftests/text/auto-hyphenation-10.html
rename : layout/reftests/text/auto-hyphenation-8-ref.html => layout/reftests/text/auto-hyphenation-8.html
rename : layout/reftests/text/auto-hyphenation-9-ref.html => layout/reftests/text/auto-hyphenation-9.html
rename : services/common/servicesComponents.manifest => services/sync/SyncComponents.manifest
extra : rebase_source : 6b9d955241e189e52c6145f3fb4c3169ec834b78
Bug 831658 - Handle multiple RegExpShareds in the same compartment. r=dvander
Bug 832104 - Don't report CSS errors in production builds r=cjones
Merge m-c to inbound.
Bug 752218 - Replace usage of AddURI with updatePlaces. r=mak
Bug 829909 - Fix some Plugin Hang UI synchronization problems. r=bbondy
Bug 832117: Check that the referent root is nonnull. r=roc a=blocking-b2g