Bug 924894 - Split prefs files up for Metro and Desktop when running in the same profile. r=jimm
Bug 933015 - Attach Editor controller to the hidden textarea instead of a CM window. r=benvie
Bug 887868 - Remove search.sqlite migration code. r=gavin
Bug 738998 - Fix tooltip not showing in style editor. r=harth
Bug 934658: Non-rectangular clip operation in BrowserToolbar's Favicon. [r=mfinkle]
Bug 930162: NPE in TabMenuStrip. [r=lucasr]
Bug 933739 - Don't handle text changes if not in editing mode (r=bnicholson)
Merge fxteam to m-c