bug 815852: inline l10n resources to avoid flickering on all localized apps
Bug 827842 - [Call log] Deleting all entries when there are more than one entry from the same number is not working.
Bug 819196 - [FTE] After importing some FB contacts an incorrect message is displayed
Merge pull request #7363 from jmcanterafonseca/fix_ftu_fb_2

Bug 819196 - [FTE] After importing some FB contacts an incorrect message...
Bug 823862 - [Settings] double/triple clicks would make settings screen white. r=kaze
dump exception when file not found
Merge pull request #7403 from vingtetun/823862

Bug 823862 - [Settings] double/triple clicks would make settings screen ...
Merge pull request #7393 from fabi1cazenave/inline-l10n

bug 815852: inline l10n resources to avoid flickering on all localized apps, r=ochameau
Bug 824783 - [email] "No mail in this Folder" overlaps the actual emails in the sent folder if the phone times out. regression fix, a=bustage-fix

land regression fix:
https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/111
Merge pull request #7404 from asutherland/email-cangrowsync-regression

Bug 824783 - [email] "No mail in this Folder" overlaps the actual emails...
Bug 828057: Bump maxVersion in httpd/install.rdf to 21.0.*, for this week's gecko version-number increase. r=fabrice
Merge pull request #7405 from dholbert/master

 Bug 828057: Bump maxVersion in httpd/install.rdf to 21.0.*, for this week's gecko version-number increase. r=fabrice
bug 815852, follow-up: LOCALES_FILE can be either a relative or absolute path
Merge pull request #7406 from fabi1cazenave/inline-l10n-followup

bug 815852, follow-up: LOCALES_FILE can be either a relative or absolute path, r=21
Merge pull request #7395 from gtorodelvalle/dialer-bug-827842-delete-all-call-log-entries

Bug 827842 - [Call log] Deleting all entries when there are more than one entry from the same number is not working (r=borjasalguero)
bug 815852: now works with and without multilocale
Bug 826558 - STK app does not display help info. Add the main Help menu. r=vingtetun
Merge pull request #7408 from vingtetun/826558

Bug 826558 - STK app does not display help info. Add the main Help menu....
Merge pull request #7407 from fabi1cazenave/inline-l10n-followup2

bug 815852: now works with and without multilocale, r=21