Bug 933030 - Eliminate thebes use from CanvasRenderingContext2D.cpp r=mattwoodrow
Bug 933966 - Fix reindentation in CGWrapper. r=bz
Bug 934157 - Fix BaseRect::IsFinite() to actually work. r=Bas
Merge m-c to m-i
Bug 914255 - Reduce the number of objects tracked in a TypeSet, r=bhackett
Bug 933579 - Export IsVideoContentType() to VideoUtils, so that it can be used elsewhere, and move all of VideoUtils into namespace mozilla. r=kinetik
Bug 932149 - add --e10s option to mach's mochitest commands and to testrunner.py.  r=ted
Bug 932440 - Re-fix a compiler warning in memorymetrics that was fixed in bug 924608 but was then undone by a bad manual merge.  r=me.

--HG--
extra : rebase_source : 370eacd5a6f0d0015e0b685ea66a4c47df248a34
Bug 933030 - Addition: Remove external dependency added to Moz2D. r=mattwoodrow
Bug 934286: Ifdef Mozilla specific cairo function usage. r=mattwoodrow
Bug 934287: Add size and for data DrawTarget creation functions. r=mattwoodrow
Bug 933587 - Fix undefined Ci reference in session store (r=markh)
Bug 930202 - Cancel pending session collections when restoring (r=ttaubert)
Bug 930202 - Fix aliasing issue in session restore (r=ttaubert)
Bug 930202 - New session restore tests (r=ttaubert)
Bug 932552 - add tests for comments in manifest expressions.  r=jhammel
Bug 930849 - add a datareporting field to mozinfo.  r=ted
Merge m-c to m-i
Bug 933074 - Allow a pldhash to be reasonably overloaded if it cannot be grown further.  r=jorendorff.

--HG--
extra : rebase_source : 0760f78d5332b4791899c1db649493eeca10b978
Bug 933605 (part 1) - Remove DEBUG_XXXbrendan-only code.  r=jorendorff.

--HG--
extra : rebase_source : 8ebc751e246cf133f899a8563e75f9bff77d9eda