bug 827778 - copy shared/resources/languages-*.json to locales/, with underscores
Bug 829110 - add tests for navigator.mozId.request oncancel() callback
Merge pull request #7523 from jedp/829110-test-oncancel

Bug 829110 - add tests for navigator.mozId.request oncancel() callback; r=ferjm
Bug 828578 - [Email] Not able to compose a new email by tapping an email address in an email body. r=lightsofapollo, a=blocking-basecamp
Merge pull request #7399 from escapewindow/master

Bug 827778 - Move shared/resources/languages-*.json to locales/, r=kaze
Merge pull request #7525 from asutherland/email-fix-mailto

Bug 828578 - [Email] Not able to compose a new email by tapping an email address in an email body. r=lightsofapollo, a=blocking-basecamp
Auto-merge from branch 'master'