Bug 415413 - Incorrect widths and heights of MathML with italics in table cells. r=karlt, r=roc
Bug 941643 - Use menlo and consolas. r=bgrins
Bug 941046 - Add test to ensure that clicking on the first pixel of the nav-bar on Windows in maximized mode on a default profile will hit the back button. r=felipe
Bug 883500 - Update query to avoid bookmarks with null URLs. r=mfinkle
Bug 941752: Fix misspelled attribute name and undefined property warning; r=Mossop
Backed out changeset fccb1956961e (bug 415413) for Android reftest failures.
Bug 913985: Part 1 - Introduce a nicer annotation API for the generator, and migrate all existing annotations to it. r=kats

--HG--
rename : mobile/android/base/mozglue/OptionalGeneratedParameter.java => mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java
rename : mobile/android/base/mozglue/GeneratableAndroidBridgeTarget.java => mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java
Bug 913985: Part 1.5 - Update the annotation processor to handle the renamed annotations. r=kats
Bug 913985: Part 2 - Add annotations to all remaining JNI entry points, marking them for generations. r=kats
Bug 913985: Part 3 - Update the annotation processor to generate wrapper classes. r=kats

--HG--
rename : build/annotationProcessors/MethodWithAnnotationInfo.java => build/annotationProcessors/AnnotationInfo.java
rename : build/annotationProcessors/utils/AlphabeticMethodComparator.java => build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
rename : build/annotationProcessors/utils/GeneratableEntryPointIterator.java => build/annotationProcessors/utils/GeneratableElementIterator.java
Bug 913985: Part 4 - Add new generated code to version control. r=kats
Bug 913985: Part 5 - Refactor the Bridge to use the generated code. r=kats
Bug 913985: Part 6 - Remove redundant AndroidBridge::Bridge() checks. r=kats
Bug 919060 - Make browser_625016.js wait for another saveState() call if the window is untracked r=smacleod

From 76e6452a6b370fdce5147e9d467e28e8e8350b50 Mon Sep 17 00:00:00 2001
Merge m-c to fx-team.
Bug 939098 - Stop markup view parsing color names out of context. r=jwalker
Bug 941328 - Don't scroll to top when double-tap zooming out [r=ally]
Bug 941331 - Leave a margin when double-tap zooming to an element [r=ally]
Merge fx-team to m-c