Bug 948205 - Rename seer.sqlite (and fixup schema in the process). r=mcmanus r=vladan
Bug 951966 part.1 Add new pref to support IMM-IME even in TSF mode and rename intl.enable_tsf_support to intl.tsf.enable r=jimm
Bug 951966 part.2 Associate or disassociate IME context to focused window even in TSF mode r=jimm
Bug 951966 part.3 nsIMM32Handler should handle messages even in TSF mode r=jimm
Bug 951966 part.4 nsIMM32Handler shouldn't handle any messages in TSF mode if active IME is not implemented with IMM r=jimm
Bug 951966 part.5 nsTextStore should handle WM_INPUTLANGCHANGE on WinXP for caching if active IME is IMM-IME r=jimm
Bug 948744 - b2g wasabi build for 1.3, r=aki
Merge m-c to inbound
Bug 958010 - Disable to wrap DNS resolver on gonk-kk. r=glandium
Bug 959026: Add telemetry about cases where we don't do OCSP fetching when we expect to, r=keeler

--HG--
extra : rebase_source : f7e9826569325f497273a92eec5127c414baa8bc
extra : source : bb5bb5a1b571e54695a4c8d5be0cc447f29f0358
Bug 957667: Decouple OCSP stapling pref from the OCSP fetching pref, and couple the OCSP required pref to the OCSP fetching pref, r=keeler

--HG--
extra : rebase_source : 86cb86f76f4def579fcf07e479025852849c34f8
extra : source : 08115711a4e6e77971c9e872fb6c68e88ac9693e
Bug 957450 - fix compile error in gonk-kk. r=iacobcatalin
Bug 948337 - create BluetoothHfpManagerBase for audio manager access
Bug 958882 - Add script size limit for TI new-script analysis. r=djvj
Merge mozilla-central and inbound
Bug 955911 - r=roc
Bug 941725 - Add emacs and vim key bindings to source editor. r=harth r=benvie r=msucan
Backed out changeset c15cacb7efd6 (bug 941725) because of test failures
Bug 958101 - Pass named params to onFindResult as object properties [r=evilpie]
Bug 958243 - Get unregister/registerEventListener calls in sync [r=mfinkle]