Bug 868123 - [MMS] handle messages with bad SMIL/content-id - r=julienw
Merge pull request #9573 from gaye/fix-lint-error

Bug 855814 - Fix lint issues introduced by evanxd patch
Merge pull request #9516 from gnarf37/868123-bad-smil

Bug 868123 - [MMS] handle messages with bad SMIL/content-id
Bug 868654 - In the day view, 12 PM is wrongly written as 12 AM