Bug 839855 - Fix margin on favicon in tabs from last time section. r=bnicholson
Bug 839855 - Use dominant color as background for small favicons. r=wesj
Bug 863857 - Add icon for character encoding menuitem, and update generic add-on menuitem icon. r=mfinkle
Bug 999999 - Fix typo in comment (r=lumpy).
Bug 866150 - Revert TopSitesView cleaup changes from bug 865060. r=bnicholson
bug 865798 add timestamps to social provider install for proper fhr support, r-felipe
Bug 861530 - unwrap for _content. r=bholley
Bug 863264 - delete pointless initialization of mBoundingBox in gfxFont::RunMetrics constructor; r=BenWa
Bug 864734 - Add to Stagefright blocklist for various crashing Android devices - r=bjacob

--HG--
extra : rebase_source : f56ac9d6a3b1206c9476e880ca941dab49c6cf16
Bug 788319, fixups to make EGL work with gtk. r=bjacob
Bug 788319. Rename RenderToEGLSurface. r=kats
Bug 866893 - Remove support for multiple geolocation providers. r=mvines
Bug 866913 - Reset high accuracy flag on StopDevice(). r=mvines
Bug 865240 - fix IUnknown implementation, r=tbsaunde

--HG--
rename : accessible/src/windows/msaa/AccessibleWrap.h => accessible/src/windows/msaa/IUnknownImpl.h
Bug 865768 - CSS files should use '%' as preprocessor marker. r=fabrice
Bug 835255 - Part 1 - don't use first PNN record when OPL is present but phone is in a PLMN that is not listed in OPL. r=vicamo
Bug 866570 - test. r=smaug
Bug 860150 - [Audio] Audio_Data API should join audio channel. r=kinetik
Bug 864711 - Simplify test page for browser_pageshow.js to ensure it's put into bfcache; r=yoric
Merge m-c to fx-team.