Bug 888587 - Change the History menu access key to y. r=msucan
Bug 795979 - RDP, new packet type: getObjectsProperties. r=past
Bug 906025 - [responsive mode] vertical resizer moves incorrectly after rotate. r=paul
Bug 905933 - Improve plural form for AndXMoreFiles string, r=enndeakin
Bug 879375 - Adapt reflow exclusion list entry for tabPreviews.capture() to recent changes; r=me/test-only
Backed out changeset e039f5fc18d0 (bug 795979) on suspicion of causing failures in browser_sanitize-timespans.js on a CLOSED TREE
Merge mozilla-central and fx-team
Bug 420355 - Delete residual .part file when canceling a download from Save As dialog. r=biesi
Bug 851672 - Rename quitApplicationCmdMac.key to reflect reuse on Linux. r=tabraldes
Bug 900234 - Replace LinkedHashMap with ArrayList to allow insertions. r=wesj
Bug 888492 - Use the content window rather than tabbrowser for load notifications. r=jwalker

--HG--
extra : rebase_source : 6b1ec0d80b7decb972f5c6f0a0aad51e33cb3c25
Bug 898580 - Metro mechanism for content to inform APZC about scroll events. Handles multi-APZC. r=bbondy, r=kats
Bug 898580 - Remove updating of scroll offset in AsyncPanZoomController::NotifyLayersUpdated. It is now no longer needed by any platform. r=bbondy, r=kats
Bug 905782 - Make the XPCShell harness treat running a single file as a sequential run. r=ted
Bug 666399 - New Harmony syntax for generators. r=Waldo

Add a GeneratorKind enumeration, and use it in the parser and runtime to
indicate whether a function is a non-generator, a legacy generator, or a
star generator.

Always parse "yield" as TOK_YIELD, regardless of the version.  Add
TokenStream::currentName() to retrieve the current token's name, which
works for TOK_NAME or TOK_YIELD.  The parser should check the validity
of "yield" as a name, if needed, using checkYieldNameValidity().

Parse "function*" as the StarGenerator GeneratorKind, and allow star
generators to be lazily parsed.

Separate parsing of return statements from yield expressions.
Bug 899878 - Mochitest for recording media with no timeslice for media recording API. r=roc
Bug 906698 - nsUTF16ToUnicode is mis-converting on big-endian processor. r=smontagu
CLOSED TREE
Bug 906119 - Enable incremental linking with Visual C++; r=glandium

--HG--
extra : rebase_source : 936287f63c95baa535a4991bc1106a3f9f59f36f
Bug 681152 - Disable bug512295-1.html on all platforms because of intermittent failures

Landed on a CLOSED TREE with RyanVM's blessing
Bug 906150 - initialize an empty RangeData at each point of use in nsSelection.cpp; r=smaug