Bug 827369 - Homescreen edit mode: Move the x icon to the top left [r=vingtetun]
Bug 826291 - Make support info a customizable parameter outside l10n. r=vingtetun,f=kaze+pike
Merge pull request #7396 from vingtetun/826291-landing

Bug 826291 - Make support info a customizable parameter outside l10n. r=...
Merge pull request #7361 from crdlc/bug-827369

Bug 827369 - Homescreen edit mode: Move the x icon to the top left [r=vi...
Auto-merge from branch 'master'