Bug 880571 - [video] handle error codes for video element
Modified Makefile to include partner-prefs.js file from GAIA_DISTRIBUTION_DIR if it exists
Bug 884728 - [Facebook] Linking feature is broken deleting all local information for a contact
Bug 883148 - Refactor to a constant; fixed typo
Bug 829023 - [Settings] Don't use dividers to separate paragraphs in thesame text block | Follow up patch
Merge pull request #10435 from dominickuo/bug-880571

Bug 880571 - [video] handle error codes for video element. r=daleharvey
Merge pull request #10400 from pivanov/bug-829023

Bug 829023 - [Settings] Don't use dividers to separate paragraphs in thesame text block | Follow up patch r=@samjoch
Merge pull request #10397 from ednapiranha/bug883148

Bug 883148 - Refactor to a constant; fixed typo
Merge pull request #10501 from crdlc/bug-884728

Bug 884728 - [Facebook] Linking feature is broken deleting all local inf...
Revert "Bug 872976 - Delay the timing of restoring connection to decrease the failure rate"

This reverts commit 9db0247970e19fb0d57e3eed4fa5bbbfd79f1ebe.
Merge pull request #10535 from AntonioMA/master

Bug 885682: Allow including preference files from GAIA_DISTRIBUTION_DIR r=ochameau
Merge pull request #10560 from frsela/STK/Bug880353

Bug 880353 - [STK] "STK_CMD_DISPLAY_TEXT" code refactoring
STK_CMD_LAUNCH_BROWSER moved to system