Bug 754860 - Disable test_bug726904.html on OS X for too many intermittent failures
Bug 845190 - Disable test_645970.js on debug Linux for too many intermittent assertions
Bug 768482: Add URI of resource to "file not found" exception in asyncFetch(). r=bz
Bug 841028: Add last build ID to telemetry system info if build ID has changed. r=froydnj
Merge m-c to inbound.
Bug 851920 - Resources removed from the pre-processing chain are still dependant on MOZ_PROFILING/MOZ_TELEMETRY* r=lucasr

--HG--
rename : mobile/android/base/resources/menu-large-v11/browser_app_menu.xml => mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
rename : mobile/android/base/resources/menu-v11/browser_app_menu.xml => mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
rename : mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml => mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
rename : mobile/android/base/resources/menu/browser_app_menu.xml => mobile/android/base/resources/menu/browser_app_menu.xml.in
Bug 850676 - test_mixed_content_blocker_bug803225.html is causing docshell/test/navigation tests to fail. r=tanvi
Bug 782211 - Part 1: Implemented additional functionality in Fennec to support Notification API. r=wesj
Bug 782211 - Part 2: Updated the nsIAlertsService API and its implementation to include support for bidi overrides and a method to close notifications. r=dougt
Bug 782211 - Part 3: Make nsDesktopNotification generate unique name and cookies to prevent collision in the IPC observer and coalescing in the alerts service. r=dougt
Bug 782211 - Part 4: Add function to remote test for permission in nsIPermissionManager. r=cjones
Bug 782211 - Part 5: Implement Notification API. r=smaug

--HG--
rename : docshell/test/test_bug344861.html => docshell/test/navigation/test_bug344861.html
Bug 782211 - Part 6: Updated the B2G notifications to implement the Notification API. r=etienne
Bug 782211 - Part 7: Added permission prompt for desktop notifications on desktop platforms. r=MattN
Bug 842852 - LocalStorage performance improvements. r=mak
Bug 848803: LICM shouldn't hoist intructions that depend on instruction in or after the loop, r=jandem
Bug 849246 - Follow the scroll velocity for the dynamic toolbar. r=kats

In the rare situation that you cause a fast fling with a very short motion,
it's possible that the toolbar won't hide/show as you expect. Fix this by
saying that any swipe that's faster than the default animation speed
dictates the direction in which the toolbar moves.
Bug 847607 - Paris bindings for IDB event, r=khuey

--HG--
extra : rebase_source : de5c4ba79b8d990b25abaabd3892847f286737fd
Bug 850270 - write a request's rectangle directly in nsDOMNotifyPaintEvent; r=smaug
Bug 849958 - Add primitive axis-locking code to dynamic toolbar. r=kats

Add some axis-locking code that adds a scroll threshold to toolbar appearance,
and stops the toolbar from appearing when scrolling down then up when the
toolbar isn't visible, or when scrolling side to side.