bug 926325 - Refactored test to avoid js errors in test run; r=mikeratcliffe
Bug 928217 - Enable core location geolocation conditionally. r=jdm/smichaud
Merge m-c to m-i
 Bug 928712 - Remove the rest of the unneeded prtypes.h inclusions; rs=bsmedberg
Bug 928765 - Create MediaDecoderReader::GetBuffered() base implementation that estimates buffered ranges, so that subclasses do have to keep reimplementing the estimation. r=doublec
Bug 928787 - Convert in-content preference style sheets to LF; r=jaws
Merge fx-team to Mozilla-Central
Merge mozilla-central to fx-team
Bug 780379 - Add buttons to download prompts. r=mfinkle
Bug 928947 - Typo in onProgressChange in the DownloadLegacy component. r=enn
Bug 925796 - Fix bookmark creation for Metro l10n repacks [r=gps]
Bug 904299 - Delete and stop writing services manifest files. r=me
DONTBUILD NPOTB

--HG--
extra : rebase_source : 1f0934683a7d80e36f514543fa48c3d9de025109
Bug 925467: Part 1: Workaround to make OSK more consistent. r=jmathies
Bug 925467: Part 2: Blur the about:config search box to close the osk when tapping on content. r=jmathies
 Bug 925467: Revert push to wrong patch. 418d0fbd33b0. r=me
Bug 925467: Part 2: Blur the about:config search box to close the osk when tapping on content. r=jmathies
Bug 812683 - Fix various crashes in Windows graphics libraries by blocking the ASUS Gamer OSD software, which is discontinued and unsupported, r=jrmuizel

--HG--
extra : rebase_source : 673dc4634f41dd334f53b30da13e7bea854e1fb6
Bug 927944 - Annotate crash reports with a list of DLLs that were blocked via the windows blocklist. Also fix the blocklist to recognize forward-slash as a path delimiter, r=ehsan

--HG--
extra : rebase_source : 5cbff13357fe96c5a86b5511a58b69176aa71817
Bug 927944 part B - move AutoCriticalSection to nsWindowsHelpers.h and use it instead of manual lock handling in nsWindowsDllBlocklist.cpp, r=ehsan

--HG--
extra : rebase_source : 54e55b729263bffbb5a92c3336eacf248e99a659
Fixup for bug 927174 - use the preexisting app.support.baseURL pref instead of a custom one

--HG--
extra : rebase_source : 90f2f8dc85b9198bca608b46bee037d93a118543