Bug 424712 - Server location needs a slash at the end. r=rnewman
Merge m-c to s-c.
Bug 799729 - Generalize BaseResource authentication to support Basic-Auth, MAC, and Browser-ID. r=rnewman
Merge m-c to s-c.
Merge m-c to s-c.
Merge m-c to s-c.
Bug 804760: Drop cached image when we stop capturing + debugs r=anant
Bug 816664: wallpaper patch for negative delta times for video frames r=roc,derf
Bug 823317 - Close All Tabs does not close the tabs tray, r=bnicholson
bug 819902 - system settings pac file failed redirect r=biesi
Bug 824885 - Fix -Wdeprecated-writable-strings warnings in xremote code.  r=karlt.
Bug 825079 - Fix -Wint-to-pointer-cast warnings and remove trailing whitespace in nsBaseWidget.cpp.  r=roc.
Bug 819819 (part 2) - Remove |name| from NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN.  r=jlebar.

--HG--
rename : dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing_perwindowpb.html => dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing.html
rename : toolkit/components/places/tests/browser/browser_favicon_privatebrowsing_perwindowpb.js => toolkit/components/places/tests/browser/browser_favicon_privatebrowsing.js
extra : rebase_source : 557cc60522970ce7eea3b006d357284d9b4694c4
Bug 825096 - Fix three clang warnings in accessible/.  r=surkov.

--HG--
extra : rebase_source : 5b26ed2307b240d7d7eb60a866ac33995ab654de
Bug 824715 - Correctly calculate next page offset in custom linker; r=glandium
Bug 824895 - check if mConnection is ready before running SetProperty(), r=gyeh
Bug 822584 - Run elfhack on packaged binaries instead of built binaries. r=ted
Bug 822584 - Workaround in elfhack to accomodate for breakpad not handling the memory mapping induced by the elfhack/bionic linker combination. r=nfroyd
Bug 822584 - Enable elfhack workaround for breakpad on b2g/gonk. r=ted
bug 814718 - Remove invalid gum tests for ended and played. r=roc