Bug 829953 - Interact with FHR properly from about:healthreport; r=rnewman
bug 830418 - hide health report menu items if health report is disabled, r=rnewman
bug 830498 - fix hardcoded brand references in data choices prefpane, r=jaws
bug 830090 - Access key for Choose What I Share button in info bar is broken, r=gps
Bug 828149 - Cancel timer during application shutdown. r=rnewman
Bug 828149 - Enable Firefox Health Report on Linux; r=mconnor

We suspect the previous patch fixes the shutdown crash on Linux that
caused us to disable FHR on Linux.
Bug 830626 - Add HealthReportComponents.manifest to package manifest; r=trivial
Merge mozilla-central into services-central
Bug 830332 - jittest gc/incremental-state.js fails if rooting analysis enabled r=billm

--HG--
extra : rebase_source : f4abcc5eb03229f9725181887b3d239acccd2392
Bug 830792. Build SkAnnotation.cpp. r=gw280

To link SkPaint.o with rtti we need to build SkAnnotation.o

--HG--
extra : rebase_source : f097dd54c13307a19b58588b51834bd162d1fa9b
Bug 830131 - Avoid null String comparison in InputMethods.java; r=cpeterson
Merge mozilla-central into mozilla-inbound
Bug 828184 - Block qipcap.dll version 7.6.815.1 and earlier for a topcrash related to an interface change of nsIPrefBranch, r=ehsan
Bug 638219: move JIT testing code closer to other JS test code; r=terrence

--HG--
rename : js/src/jit-test/jit_test.py => js/src/tests/lib/jittests.py
extra : rebase_source : 361c4b509ba263b406c8eb1ee6f3ff57462fc509
Bug 814308 - MediaDecoder::SetDuration doesn't handle aDuration=inf correctly.  r=kinetik
Bug 804875 - Reset media element when loading a new src. r=kinetik
Bug 804875 - Tests. r=kinetik
Bug 819377 - Don't offset the clock by the start time of the video in AdvanceFrame, and set the media as playing earlier. r=kinetik
Bug 825329 - Fixed the getter for the playbackRate in AudioStream. r=kinetik
Bug 825329 - Update tests. r=kinetik