Bug 1077458 - Implement marker's waterfall view in new performance tool, with details view toggling between  waterfall and call tree views. r=vp
Bug 1090874 - Avoid always re-creating the node when editing a tagname in the markup-view; r=pbrosset
Bug 1105808 - Use ttf fonts in browser_fontinspector.js test. r=bgrins
Bug 898613 - Back button behavior for url toolbar in display/editing mode. r=mcomella
Merge mozilla-central to fx-team
Bug 1106416 - Small UI fixes for the new performance tool, r=jsantell
Bug 1107210 - Fixed room name update not correctly reflected in Loop panel. r=Standard8
Bug 1059600 - Set the URI as the initial tab label for javascript links opened in new tabs. r=gijs

--HG--
extra : rebase_source : 3a28661f42daa9ec6243234d9d1eaf8b01055e32
Bug 1101482 - fix e10s case for browser_988072_sidebar_events.js, r=intermittentisgone

--HG--
extra : rebase_source : b13a515434002d396f1077f1fc59f43db94f30e8
Bug 1107698 - setAlpha after setColor in ResizablePathDrawable. r=lucasr
Bug 1098371 - strings for improved sslv3 error, f=flod,r=mconley

--HG--
extra : rebase_source : 4edcb49f99d0d248612a1678777e417ca46dd72a
Bug 980481 - Check for null __poolMap in the protocol.js unmanage method. r=ochameau
Bug 980481 - RemoteDebuggerServer e10s setupParent helper. r=ochameau

Changes to the RemoteDebuggerServer main.js and child.js to provide hooks needed by modules which want to propagate their data lazily between the e10s parent and child processes.
Bug 989053 - Make box model regions on page content more visible. r=pbrosset
Bug 1105053 - Move LightweightTheme* to lwt/. r=vivek

--HG--
rename : mobile/android/base/LightweightTheme.java => mobile/android/base/lwt/LightweightTheme.java
rename : mobile/android/base/LightweightThemeDrawable.java => mobile/android/base/lwt/LightweightThemeDrawable.java
Bug 1106239 - Fix up the styling for about:home's and about:newtab's search panel and about:newtab's customize panel. r=felipe
Bug 1106936 - [e10s] Fix progress throbber for remote browsers r=billm
Backed out changeset 84c03250d7f6 (bug 1106936)
Merge fx-team to m-c. a=merge