Bug 1006051 - Follow-up: correct over-zealous regex replace. r=trivial
Backed out changeset ee1a53319c19 (bug 1042092) for m-oth bustage
Merge m-c to fx-team
Bug 763671 - Simplify form styles in Fennec. r=mfinkle
Bug 1024073 - Whitelist plugin: Roblox Plugin launcher. r=gfritzsche
Bug 1029654 - Whitelist plugin: Box Edit. r=gfritzsche
Bug 1024965 - Whitelist plugin: Nexus Personal. r=gfritzsche
Backed out changeset 6acef5be504c (bug 763671) for android Reftest failures
Bug 987864 - Move API 13 styles to values-v13 folder. r=wesj

--HG--
rename : mobile/android/base/resources/values-v14/styles.xml => mobile/android/base/resources/values-v13/styles.xml
Bug 981041 - Add back preference to disable transitions in Style Editor. r=harth
Bug 1009078 - Console: Represent empty slots of arrays with a placeholder label instead of commas and whitespace. r=dcamp
Bug 1026023 - Part 2: Implement Physically Based Movement Model. r=mwoodrow
- Implemented the AxisPhysicsModel class, which encapsulates interpolation and
  integration of a 1-dimensional physics model in a frame-rate independent
  and stable manner.
- Implemented the AxisPhysicsMSDModel class, which models a generic
  1-dimensional Mass-Spring-Damper simulation.
- This physical movement simulation code has been implemented separately from
  the existing momentum code in Axis.cpp so that it can be utilized by
  both the compositor (AsyncPanZoomController) and main thread
  (nsGfxScrollFrame).
Bug 1026023 - Part 4: Allow smooth scrolling to override momentum mouse wheel scroll events. r=mwoodrow
- When a smooth scroll is being processed on a frame, mouse wheel and trackpad
  momentum scroll event updates will no longer cancel the SMOOTH or SMOOTH_MSD
  scroll animations, enabling scripts that depend on them to be responsive
  without forcing the user to wait for the fling animations to completely stop.
Bug 1038402 - Webgl half float support used wrong shift value when converting from packed float to regular float. r=kamidphish
Bug 1034267 - Structured Logging for robocop. r=gbrown
Bug 1044119 - Fix lost WebGL extensions generating invalid operation errors. r=kamidphish
Bug 1042791 - added case insensitive and acitvated test. r=jesup
Bug 1032255 - TPS has to exit with code != 0 in case of failures. r=aeftimie, dhunt
Bug 1020416 - Added forceValidFor() and isForcedValid attribute to nsICacheEntry. r=honzab, michal
Bug 1043147 - Update CDMProxy and EME JS APIs to proxy calls to a GMP/CDM. r=ehsan