Merge remote branch 'aaronmt/march-2013-devices'
Merge remote branch 'mozilla/master'
Merge remote branch 'mozilla/master'
Merge remote branch 'mozilla/master'
Merge remote branch 'mozilla/master'
Bug 818699: Installer help website should point to the full Aurora download file, not the stub installer

Thanks to the new download button, just need a force_full_installer
Merge pull request #706 from l-hedgehog/bug-818699-force-full-installer-for-aurora-installer-help

Bug 818699: force full installer for Aurora installer help
[Bug 854889] Add new relic init to wsgi file
Bug 854889: Only use newrelic if client installed.
Merge pull request #708 from pmclanahan/bug-854889-add-newrelic

Add newrelic.
Bug 854889: Disable newrelic if import or env var fail.
Merge pull request #709 from pmclanahan/bug-854889-add-newrelic

Bug 854889: Disable newrelic if import or env var fail.
Merge remote branch 'mozilla/master'
Bug 855383: Add ipv6 domain to ALLOWED_HOSTS.
Swap in another video for the flicks promo
(Bug 842314)
Update Persona privacy policy to reflect recent changes.

    Fix bug 855347.
    Fixes mozilla/browserid#3114.
    For context, see bug 848506, GH-2922, and GH-3080.
Merge pull request #711 from 6a68/persona-privacy-update

Bug 855347 update Persona privacy policy to reflect recent changes.
Bug 795546: change contribute page email for zh-CN
l10n : Bug 842122 Set up email for id contribute form
Merge pull request #717 from brianking/contribute

l10n : Bug 842122 Set up email for id contribute form