Bug 856542: don't process metadata and play videos at the same time r=dkuo
Bug 796393 - [email] duplicate accounts can be created; r=asuth
Merge pull request #9529 from davidflanagan/bug856542

Bug 856542: don't process metadata and play videos at the same time r=dkuo
Merge pull request #9550 from mozsquib/email-no-dupe-account

Bug 796393 - [email] duplicate accounts can be created
Revert "Merge pull request #9468 from gaye/sinonjs"

This reverts commit 728f181b510c540131614768289f93e90e709d61, reversing
changes made to 7e9e06a7e6c2613cb8c5b279455826f4cb3548fc.
Merge pull request #9552 from lightsofapollo/revert-sinon

Revert "Merge pull request #9468 from gaye/sinonjs"
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into bug837677-measure-email