Bug 1033686 - Make sure pre-search and post-search replace each other. r=nalexander

--HG--
rename : mobile/android/search/java/org/mozilla/search/DetailActivity.java => mobile/android/search/java/org/mozilla/search/PostSearchFragment.java
rename : mobile/android/search/java/org/mozilla/search/stream/CardStreamFragment.java => mobile/android/search/java/org/mozilla/search/PreSearchFragment.java
rename : mobile/android/search/java/org/mozilla/search/autocomplete/AutoCompleteFragment.java => mobile/android/search/java/org/mozilla/search/autocomplete/SearchFragment.java
Bug 1035335 - Don't convert number query for searches. r=mfinkle
Merge m-c to fx-team. a=merge
Bug 1030779 - Add -private-window to command-line help output. r=jdm
Bug 1033079 - Part 1: Server style cleanup. r=past
Bug 1033079 - Part 2: Support multiple listening sockets. r=past
Bug 1035296 - Make protocol.js pass error messages for unknownError. r=past
Bug 1035300 - Drop support for page report with oneshot data. r=harth
Bug 1036449 - Introduce a noreload flag for csscoverage start. r=harth
Bug 862563 - Remove implicit acceptance for data reporting notification and notify on first run; r=gps

The data reporting notification was over-complicated. It wasn't
displayed for +24hr after first run and it had a weird, non-required
policy around what constituted acceptance of the policy.

The notification is now shown shortly after first startup.

The logic around "notification accepted" has been greatly simplified by
rolling it into "notification shown." Where we once were checking
whether the notification has been "accepted," we now check whether it
has been displayed. The overly complicated logic around the implicit
acceptance of the policy has also been removed.

The end result is the code for managing the state of the notification is
greatly simplified.

--HG--
extra : rebase_source : 808efdf1edd103552f6aa10b5c4309b64e514773
extra : amend_source : e4252e6a850a348d1b5aca733121dd07cbc6a70a
extra : histedit_source : 10ec20a07677674a8c9a705a3ffb4dc46a22b890%2Ca9442934d5964f16e9ad1101b786b4d094ac228d
Bug 693808 - part 0: add function decorator to nsIDNSListener, r=bsmedberg
Bug 1028705 - Accidentially dropped code from bitrot resolution. r=trivial
Backed out changeset 8673477f5fc2 (bug 862563) for Windows mochitest-5 failures
Bug 1037217 - Listen for DOMLinkChanged as well as DOMLinkAdded to update favicons r=bnicholson
Bug 1032721 - Re-enable browser_inspector_infobar.js when oranges are fixed r=pbrosset

--HG--
rename : browser/devtools/inspector/test/browser_inspector_infobar.js => browser/devtools/inspector/test/browser_inspector_infobar_01.js
Bug 1033387 - Update JSBeautify and move it into toolkit r=fitzgen

--HG--
rename : browser/devtools/shared/Jsbeautify.jsm => toolkit/devtools/jsbeautify/beautify.js
Backed out changeset 0ba8be1413f7 (bug 1033387) for xpc test failures
Bug 1033387 - Update JSBeautify and move it into toolkit r=fitzgen

--HG--
rename : browser/devtools/shared/Jsbeautify.jsm => toolkit/devtools/jsbeautify/beautify.js
Backed out changeset e2360d41bd66 (bug 1033387) for loader test failures
merge fx-team to mozilla-central a=merge