Bug 878670 - Version profile information cache file. r=nalexander
Bug 878303 - Part 1: implement TYPE_COUNTED_STRING_DISCRETE. r=nalexander
Bug 878303 - Part 2: use COUNTED_DISCRETE type for searches. r=nalexander
Merge m-c to s-c.
Bug 868445 - Part 1: allow recording of JSON objects. r=nalexander
Bug 868445 - Part 2: sessions provider for FHR on Android. r=nalexander
* * *
More sessions.
Bug 879225: NetworkManager - extract hostname from various formats. r=gene
Bug 877141 - add test cases for sending SMS with continuous space characters. r=gene
Merge mozilla-central and birch
Bug 879529 - Fix thread priorities in B2G child processes. r=gsvelto

Previously, suppose we were changing a process's priority from 18 to 1.
If a task had priority 19, that should have changed to 2.  But instead
we changed it to 18!  That's totally wrong.
Bug 868445 - Follow-up: correct missing import. r=trivial
Bug 879246 - Fix intermittent failure in test_sourcemaps-02.js. r=past
Merge m-c to s-c.
Merge birch to m-c.
Merge fx-team to m-c.
Merge inbound to m-c.
Merge m-c to inbound.