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
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
Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen