Bug 1064470 - Increase the experiments forensic log buffer size again. r=bsmedberg
Bug 1067117 - Typo in Sqlite.jsm: REASON_CANCELLED should be REASON_CANCELED r=mak
Bug 1047469 - Implement search terms hilighting r=dao
Backed out changeset a6d02cff43d3 (bug 1037235) for breaking WebIDE (bug 1067331)

--HG--
extra : amend_source : a7bfb1e931122663e7c14a7362a849520388e495
Bug 1066250 - Part 1: Always show the url in the toolbar on new tablet. r=lucasr
Bug 1066250 - Part 2: Remove title in toolbar preference on new tablet. r=lucasr
Bug 1066250 - Part 3: Update testSettingsMenuItems. r=lucasr
Merge m-c to fx-team.
Bug 899347 - [e10s] Make click-to-play work with e10s. Originally written by mbrubeck. r=gfritzsche,felipe,Unfocused.

We now use message passing and content scripts in order to implement click-to-play. This allows
us to use click-to-play in e10s windows.

--HG--
extra : rebase_source : 719afe669c638ba4883f76f18aee38df6b60b4ad
Bug 1022472 - Remove margins on default home screen panels. r=wesj
Merge fx-team to m-c a=merge