Bug 980134 - Hide DataContainerEvent from content. r=smaug
Merge m-c to m-i
Bug 984379 - Use fallible allocator for nsIScriptableUnicodeConverter. r=smontagu
Bug 977255 - Initialize the gralloc memory reporter in gfxPlatform. r=cwiiis
Bug 973264 - If we wrap gfxImageSurface data when creating a SourceSurface, hold a reference to the original surface so the data stays alive. r=Bas

--HG--
extra : rebase_source : 91833db0c39af3984dc7e7a1965486916a9f47f8
Bug 988453 - Make nsHyphenationManager::Shutdown() resilient against being called more than once.  r=roc
Bug 957560 - Fix new textures on windows (OMTC). r=mattwoodrow
Bug 987404 - Disable failing mochitest-browser tests in e10s. r=ted.
Bug 985902 - expose fxaccounts/MOZ_SERVICES_FXACCOUNTS to mozinfo and only run test_hawkclient when enabled. r=ted
Bug 957560 - Fix WError build bustage on a CLOSED TREE.
Back out 5adc1acdb309 (bug 973264) for Windows reftest bustage
CLOSED TREE

--HG--
extra : rebase_source : e7e68eb00234424a7fe4bcd6a165c5cc07f0fa30
Bug 975123 - Allow for fixed targets/devices for situations where routers block UDP broadcasts r=wesj
Bug 989407 - Stop treating mouse events as touch events because it interferes with gesture detection. r=botond
Bug 989829 - Move all APZ prefs into gfxPrefs and move all documentation into AsyncPanZoomController.cpp. r=botond
Back out 43663582cfdb (bug 987404) because it looks like it disabled things even without e10s being defined
Back out 2f5e6cd1cc9c (bug 989829) for assertion failures
merge fx-team to mozilla-central
merge b2g-inbound to mozilla-central
Merge mozilla-central to b2g-inbound