bug 824621, localize email address placeholder in ftu
Merge pull request #7293 from Pike/bug-824621-l12y-email-address

bug 824621, localize email address placeholder in ftu
Fix unit test instructions in readme
Bug 826468 - [Email] Change in XHR behaviour makes autoconfig fail on "Looking in local file store" for all domains not in gaia/apps/email/autoconfig/ (workaround); r=asuth, a=blocking-basecamp
Merge pull request #7296 from mozsquib/email-autoconfig-xhr-workaround

Bug 826468 - [Email] Change in XHR behaviour makes autoconfig fail on "L.ooking in local file store" for all domains not in gaia/apps/email/autoconfig/ (workaround)