Merge pull request #6686 from fcampo/ftu_notification_string

[815084] fi is one letter instead of two in locales
Merge pull request #6719 from fcampo/ftu_typo

[816467] Fix typo in properties
Bug 817181 - [Settings] Panes are scrollable horizontally but they shouldn't be
Bug 816243 - Overlay long text does not fit correctly for the tabs in the awesome screen
Merge pull request #6779 from alivedise/bugzilla/815857/homescreen-get-a-call

Bug 815857 - fixing homescreen visibility on getting a call
Merge pull request #6786 from vingtetun/816243-landing

Bug 816243 - Overlay long text does not fit correctly for the tabs in th...
Bug 816987 - [email/IMAP] bug in mimelib dep on consecutive base64-encoded mime encoded-words breaks IMAP synchronization due to our Buffer shim's angry base64 decoding. r=squib, a=blocking-basecamp
Merge pull request #6789 from asutherland/fix-base64-explosions

Bug 816987 - [email/IMAP] bug in mimelib dep on consecutive base64-encoded mime encoded-words breaks IMAP synchronization due to our Buffer shim's angry base64 decoding. r=squib, a=blocking-basecamp
Bug 811677 - Turn "Licensing" item into "Legal Information" and make it a sub-menu r=fabi1cazenave

a

a

a
Merge pull request #6783 from michalbe/settings-legal

Bug 811677 - Turn "Licensing" item into "Legal Information", r=kaze
Merge branch 'master', remote-tracking branch 'upstream/master'
Bug 809999 - reject MP4 files that are ALAC or videos r=dkuo a=blocking+
Merge pull request #6736 from davidflanagan/unplayablemusic

Bug 809999 - reject MP4 files that are ALAC or videos r=dkuo a=blocking+
typo
Bug 814355 - l10n_date.js / pretty dates: support compact formats
r=etienne
Merge pull request #6792 from fabi1cazenave/short-prettyDates

Bug 814355 - l10n_date.js / pretty dates: support compact formats, r=etienne
Bug 813982 - Accounts now have an entrypoint (for reauth) and calendarHome (for
sync). Upgrade the database gracefully. r=lmorchard
Merge pull request #6790 from lightsofapollo/calendar-reauth

Bug 813982 - Accounts now have an entrypoint (for reauth) and calendarHome (for sync)
bug 817763: Deleting a conflict should cause column layout to collapse, a=lightsofapollo
Bug 813882 - Fix bug where multiple allday event would stack exactally
on top of each other. Add integration tests to prove it r=lmorchard