Rename Promise to promise to avoid collisions with the forthcoming DOM Promise implementation (bug 885318); r=jwalker
Merge mozilla-central and fx-team
Bug 879375 - Add SessionStore.getWindowDimensions() and tabPreviews.capture() to the reflow exclusion list; r=dao
Merge fx-team to m-c.