Bug 1103993 - 3 - Only refresh the rule/computed views when active; r=bgrins r=ochameau
Bug 1103993 - 4 - Cleanup styleinspector tests; r=bgrins
Bug 1106010: make sure enough UI elements are always visible when not signed in to FxA. r=Niko
Bug 1102437: make sure only push updates for the appropriate channel are processed. r=Standard8
Merge mozilla-central to fx-team
Bug 1102441 - Clean up the BreakpointStore interface;r=jimb
Follow-up to bug 1045498. Fix Loop's ui-showcase to load properly. rs=nperriault over irc, NPOTB so DONTBUILD
Bug 1098552 - Bookmarks.jsm should use case-insensitive keywords. r=Mano

--HG--
extra : rebase_source : 50db985a28194821d3e5e48d829e5af240ffdb31
extra : histedit_source : 8f26bfec9edbb82c4e1f5487c45583a563bb491f%2Cc41fba608e5de3958c8702adc5b779be30b0b0d7
Bug 1105866 - Implement folderShorcutNode.targetFolderGuid (guid version of folderShortcutNode.folderItemId). r=mak
Bug 1085771 - Part 3: Update LWT UI for new tablet browser toolbar. r=lucasr
Bug 1085771 - Part 4: Move color state selector to colors/. r=lucasr

--HG--
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_item_bg.xml => mobile/android/base/newtablet/res/color-large-v11/new_tablet_tab_strip_item_bg.xml
Bug 1026342 - Show legacy-Sync-to-Firefox-Accounts migration indicators in the app menu panel. r=markh
Bug 1107541 - Display eval sources with a sourceURL pragma correctly in the debugger. r=fitzgen
Merge fx-team to m-c. a=merge