Bug 964700 - Make the errors logged by Parser.jsm also contain the problematic source url, r=past
Bug 964700 - Fix test_safeErrorString.js xpcshell test, r=me
Bug 961123: Add and integrate higher res overlay buttons. r=rsilveira
Merge inbound to m-c.
Bug 959499 - Use wifimanager for on-device mochitests. r=ahal
Bug 963544 - Do not use NS_ENSURE_TRUE() in a few places and instead expand it to reduce WARNING messages. r=khuey
Bug 963550 - Warn about OpenGL non-support only once during execution instead of spamming the log. r=bjacob
Bug 963598 - Allow custom message when Wait.until times out. r=dburns
Bug 964102 - Use normpath on the test path before comparing it with the root dir. r=gps
Bug 913597 - Remove support for obsolete 'moz-webgl' name for creation of WebGL contexts. r=jgilbert
Backed out changeset f9d83ec11ca9 (bug 936555) for checktest failures.
CLOSED TREE
Bug 962833: ensure-certverify-returns secfailure on MUST_BE_EV and no ev certificate. r=dkeeler
Merge fx-team to m-c.
Merge b2g-inbound to m-c.
Bug 965008 - Suppress warning C4996 for VC12+. r=froydnj
Bug 960846: Round Gonk touches instead of truncating them. r=mwu
Bug 937343: Spoof a touch start event on pinch end in GestureEventListener r=botond
Bug 937343: Remove pan start logic on pinch end from APZC r=botond
Backed out changeset f3c055585a4f (bug 843857) for B2G mochitest bustage.
Bug 936271 - Add tests to ensure we ignore dynamic history entries r=yoric

--HG--
rename : browser/components/sessionstore/test/browser_597315_a.html => browser/components/sessionstore/test/browser_frame_history_a.html
rename : browser/components/sessionstore/test/browser_597315_c.html => browser/components/sessionstore/test/browser_frame_history_c.html
rename : browser/components/sessionstore/test/browser_597315_c1.html => browser/components/sessionstore/test/browser_frame_history_c1.html
rename : browser/components/sessionstore/test/browser_597315_c2.html => browser/components/sessionstore/test/browser_frame_history_c2.html