Bug 906756 - Algorithms for merging givenName and familyName. Master Contact takes precedence
Bug 912554 - [Contacts] Preserve givenName and familyName of the new or being edited contact when merging.
Merge pull request #11951 from EverythingMe/911767-cloudapps-editmode

Bug 911767 - [e.me][bug] Long press on pinned cloud apps doesn't toggle edit mode [r=crdlc]
Merge pull request #11950 from EverythingMe/912386-apps-hold-click

[Bug 912386] fix long-tap on app won't prevent normal click [r=crdlc]
Update gaia-ui-tests.json; Merge pull request #1326 from bebef1987/xfail-video

xfail Bug 912957 - Film strip not visible after taking a video
Bug 911752 - Use window.open instead of a mozbrowser iframe to display external url r=arcturus
Revert "[Bug 912386] fix long-tap on app won't prevent normal click [r=crdlc]"

This reverts commit ccf3a2028158f817a5ec78ff6217e2b002d17be0.
Revert "Bug 911767 - [e.me][bug] Long press on pinned cloud apps doesn't toggle edit mode [r=crdlc]"

This reverts commit 5cc1098e3c96e1d62b1f6867348072da10669f4c.
Revert "Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc"

This reverts commit df5b866b163df32ba946bc73fe5f73891817111a.
Bug 871127 - [dialer] cannot make a second call through dialer

- Refactor the CSS for the icons
- Add a place-new-call button
- Show the dialer toolbar with a smaller height
- New tests for modified functions
Merge pull request #11931 from Rik/second-call-871127

Bug 871127 - [dialer] cannot make a second call through dialer r=etienne
Bug 913035: add network.json to .gitignore
Merge pull request #11954 from wanderview/settings-ignore-network-json

Bug 913035: add network.json to .gitignore - r=me
Bug 910876: Import NobleJS setImmediate() polyfill
Bug 910876: Customize NobleJS setImmediate polyfill
Merge pull request #11849 from wanderview/shared-zero-timeout

Bug 910876:  Import NobleJS setImmediate polyfill - r=timdream
Bug 911357 - Enable build-time overriding of default Gaia wallpaper via GAIA_DISTRIBUTION_DIR. r=yurenju
Merge pull request #11921 from jmcanterafonseca/bug-906756

Bug 906756 - Algorithms for merging givenName and familyName. Master Con...
Merge pull request #11941 from jmcanterafonseca/bug-912554

Bug 912554 - [Contacts] Preserve givenName and familyName of the new or ...
Bump marionette-helper to 0.0.6