Bug 1046880 - Throw custom exception when a property does not exist or has the wrong type; r=blassey
Bug 1046880 - Test for NativeJSObject exceptions; r=rnewman
Bug 1046880 - Catch invalid name exceptions in EventDispatcher; r=rnewman
bug 1050598 - changing the pac uri should be synchronous r=hurley

--HG--
extra : rebase_source : 15cbe1d0b6c0aa966d217d7a3c64f2295eedb923
bug 1050598 - thread local jit context for pac instead of global r=hurley

--HG--
extra : rebase_source : a6f94aec59fdfafef5edc7770f7941a6a55c1923
bug 1050598 - test for proxy_over_tls pref and https proxying r=hurley

--HG--
extra : rebase_source : 27e7e50586e4a9778299912ce45858b0df873bbd
Bug 1044181: style loader now annotates classified tracking nodes r=dbaron
Bug 1044181: object loader now annotates classified tracking nodes r=khuey
Bug 1044181: test elements are now actually loaded when tracking protection is disabled/broken. added style loader test. r=mmc
Merge m-c to inbound. a=merge
Backed out changesets 6ee4b6cc240c, a818fd0874fe, and 70803a5f4683 (bug 1033442) for multiple crashtest oranges.
Backed out changeset a470d0cbe3fa (bug 1046964) for jsreftest failures.
Bug 1009648 - nsStandardURL crashes when calling SetHost after Clear(). r=mcmanus
Bug 1027898 - Implement most of nsIContentPrefService2 for e10s. r=adw
Bug 1040130 - Allow specifying a client cert for sockets. r=keeler, r=mcmanus
Bug 1046732 - Part 1: Fix incorrect event message used in TouchCaret.cpp. r=ehsan

NS_WHEEL_EVENT_START isn't a specific event message for compairing in
the switch case. Since we would like to hide touch caret whenever
receving wheel events, all the wheel event types are added.
Bug 1046732 - Part 2: Test touch caret will be hidden by wheel event. r=ehsan

This test logic is similar to
_test_touch_caret_timeout_by_dragging_it_to_top_left_corner_after_timout.
Bug 1049684 - Fix SDP verification to be able to run on steeplechase environment. r=bwc
Bug 1001657 - Skip testPromptGridInput on Android 2.3 for frequent intermittent failures.
CLOSED TREE
Bumping manifests a=b2g-bump