Bug 1058550 - Data use alert isn't showed when limit is passed. r=vchang
Bug 1064029: Don't keep a static context reference in Favicons. r=rnewman
Merge m-c to fx-team
Bug 1064029: Unbreak the tree. r=bustage
Bug 1064217 - Fix closed window list for menu bar of hidden window on OS X r=gijs
Always complete the toolbox teardown path, even in the face of failures along the way (bug 1063926). r=paul

--HG--
extra : rebase_source : 514ace11185493879c560dad7a7fb7ad0fa48e91
Bug 1059537 - Add support for parsing icons out of search plugin XML. r=bnicholson
Bug 1064129 - Typo in cocoa/nsToolkit.mm and friends. r=spohl
Bug 1053016 - Part 1: remove libomxpluginfroyo.so from Android package. r=nalexander
Bug 1053016 - Part 2: remove Froyo conditional from AndroidMediaPluginHost.cpp. r=blassey
Bug 791244 - undo the pref for the temporary hang server for nightly/aurora, now that Socorro has the data in its API, r=gfritzsche

--HG--
extra : rebase_source : 14d923b9b21a07e43826bd2009588ad57f120655
Backed out 2 changesets (bug 1053016) for Android build bustage

Backed out changeset 498a3f688a3d (bug 1053016)
Backed out changeset 314e44e93c71 (bug 1053016)
Bug 1064246: Remove nonsensical dead getter from BrowserDB. r=rnewman
Bug 1064246: Remove some more dead code from BrowserDB. r=rnewman
Bug 1064246: Remove dead functions from LocalBrowserDB. r=rnewman
Bug 1064246: Cleanup SpecialFoldersCursorWrapper. r=rnewman
bug 1063648 - don't cache transport. r=jryans
Bug 1062112: Part 1: Cleanup GeckoEditable and GeckoSMS somewhat. r=nalexander.
Bug 1062112: Part 1.5: Move GeckoEditable interfaces to satisfy JDK 8. r=nalexander
Bug 1062112: Part 3: Move GeckoMediaPlayer. r=nalexander