Merge m-c to inbound.
Bug 841341 - Disable test on Windows due to frequent failures.
Bug 690659 - Add the optional filename parameter to the FormData.append method. r=sicking
Bug 690659 - Test. r=sicking
Bug 844932 - HashTable rekey fixup does not guarantee !overloaded; r=sfink

--HG--
extra : rebase_source : e9354d0d3377f75c56cee8a0b2d6078fa9d9fbdb
Bug 690659 - Bustage fix for clang 3.2.  r=Ms2ger
Bug 843337 - No need for getAllocKind in JSObject::finalize anymore; r=jonco

--HG--
extra : rebase_source : d5fdc33b362d7d486579f1934316e00a746a3d13
Bug 817828 - Don't use hardware layers on toolbar animations (r=sriram)
Bug 846751 - Remove unnecessary log call in TwoWayView (r=mfinkle)
Bug 847130 - Do DestroyOverflowLines() if the last line was removed instead of always RemoveOverflowLines() and SetOverflowLines() when there's lines remaining.  r=dbaron
Bug 815737 - Inline MathCache-reliant functions in IonMonkey. r=sstangl
Bug 840693 - Add ZoomScale; r=Bas
Bug 840693 - Change to using gfx:: types in AsyncPanZoomController; r=cjones
Bug 829557. Part 1: When calling into plugin code, identify situations where it is safe (or unsafe) to reenter Gecko from plugin code. r=bsmedberg
When Gecko is reentered from unsafe call sites, we allow the reentry, but we
suppress execution of the refresh driver to minimize the danger.
In this patch, we treat all sites as unsafe.

--HG--
rename : toolkit/modules/Timer.jsm => browser/devtools/shared/Browser.jsm
rename : toolkit/modules/tests/xpcshell/test_timer.js => browser/devtools/shared/test/browser_browser_basic.js
rename : build/mach_bootstrap.py => mach
extra : rebase_source : b83c1d09313bff62357eaa931eced0f72f838493
Bug 829557. Part 2: Allow plugin code to reenter Gecko safely while while the plugin is processing an input event. r=bsmedberg
When nsPluginInstanceOwner passes input events to the plugin instance,
it's safe to reenter Gecko from plugin code and do anything, even
arbitrary script execution.

--HG--
extra : rebase_source : e07820e145ec1e639b241f02b8b439b45f6e5e8b
Bug 845526. Limit complexity of invalid region in RemoveFrameFromLayerManager. r=mattwoodrow

--HG--
extra : rebase_source : 1fcc85627535cc807dc6fff36f051a81b1144a46
Bug 840695. Make aAntialiasMode default to AA_DEFAULT, because, well, it's the default. r=bas

--HG--
extra : rebase_source : f22329337aa120573efc13fa6ac0bb111ff0dba2
Bug 845907: Adds generic ReadAhead functions r=glandium
Bug 724531 - Import ICU library into the mozilla tree. r=gerv

--HG--
extra : rebase_source : 3773010618f6f72130f03c03e51671554e7e1df1
Bug 724531 - Import ICU library into the mozilla tree. r=ted

--HG--
extra : rebase_source : f4bb782e7d76c74b742b54cae785481cafb2995c