Bug 1063518 - Hide MLS "Learn More" link when MLS is disabled. r=liuche
Bug 1038797 - Add network error page. r=bnicholson
Bug 1047811 - Part 1 - Allow to commit a main-thread Storage transaction asynchronously. r=asuth
bug 1047811 - Part 2 - Use async transactions in Places. r=Mano
Bug 1063594 - main-pane-loaded notification should be sent at the end of gMainPane.init. r=jaws
Backed out changeset 925427a6d0b1 (bug 1047811)
Backed out changeset bc1363a17e0e (bug 1047811) for bustage
Bug 1050386 - [timeline] build a temporary timeline panel, r=paul

--HG--
rename : browser/devtools/shared/test/browser_graphs-07.js => browser/devtools/shared/test/browser_graphs-07a.js
Backed out changeset 0a76964b8d8d (bug 1048011) for causing regression
merge mozilla-inbound to mozilla-central a=merge
merge b2g-inbound to mozilla-central a=merge
merge fx-team to mozilla-central a=merge
Merge m-c to fx-team
Bug 1047811 - Part 1 - Allow to commit a main-thread Storage transaction asynchronously. r=asuth
bug 1047811 - Part 2 - Use async transactions in Places. r=Mano
Bug 1065369 - Consolidate 'add tab' behaviour in Tabs (r=mfinkle)
Bug 1035348 - Part 1: Move GET/calls to MozLoopService. r=Standard8
Bug 1035348 - Part 2: fix tests. 1) Added hawkRequest stub to allow completion of inbound notification setup where necessary in unit tests. 2) Replaced tests of client.requestCallsInfo() with mozLoop.getCallData. r=Standard8
Bug 1058150 - Use restricted profiles for guest mode. r=mfinkle
Bug 1065180, part 1 - Add os.getenv() function to JS shell. r=sfink.

--HG--
extra : rebase_source : 7f1ef80db80d6ad8626f76f8338c1946868534c8