Bug 892470 : add nl+ja locales to plugincheck
Merge pull request #1148 from pascalchevrel/bug892470-plugincheck_actvate_locales

Bug 892470 : add nl locale to plugincheck
Bug 904507 Home page, more horizontal space for Firefox promo text in columns
Merge pull request #1157 from pascalchevrel/Bug-904507_homepage_css_tweak_l10n

Bug 904507 Home page, promo bar, more horizontal for text in columns
Minor requirements cleanup

Remove unused django-bcrypt and its dependencies.

Update Django version in requirements.txt to 1.4.5 with explanatory
comment.

Add instruction to installation docs to install dev requirements after
compiled requirements.
Merge pull request #1158 from jgmize/minor-requirements-cleanup

Minor requirements cleanup
Fix Bug 903089 - robots.txt changes

In production, add the following line to robots.txt:

disallow: /*/newsletter/existing/*

In dev, staging, etc:

user-agent: *
disallow: *

settings.SITE_URL is used to determine if we are in production.

In etc/httpd/global.conf, add a RewriteRule to serve robots.txt from
Django.

Add robots.txt to settings.SUPPORTED_NONLOCALES to eliminate redirect.
Bug 904237  Update persona.html and persona.less
Copy changes to focus on sign-in-with-email behavior of Persona
Made relying party example block generic, named it rp-example (from previous RP used trovebox)
Merge pull request #1156 from jgmize/bug-903089-newsletter-robots

Fix Bug 903089 - robots.txt changes
/robots.txt Content-Type: text/plain
Merge pull request #1161 from jgmize/robots-content-type

/robots.txt Content-Type: text/plain
Bug 905086: enclose all strings in l10n calls
Merge pull request #1162 from pascalchevrel/Bug-905086_make_about_page_localizable

Bug 905086: enclose all strings in l10n calls
Fix clipped video-js skin image sprite
Bug 905144
Merge pull request #1163 from sgarrity/bug-905144-video-js-sprite

Bug 905144 Fix clipped video-js skin image sprite
[bug 899978] Update social share widget for Firefox OS page
Merge pull request #1120 from alexgibson/update-social-share-widget-bug-887147

[bug 899978] Update socialshare widget for Firefox OS page and add Facebook l10n helper
Fix bug 905222: Redirect Privacy Policy PDF.

This version of the Privacy Policy is obsolete. We no longer link to it,
but users could still be accessing it directly.
Bug 904765 - update Flicks promo on home page
[bug 905144] cache bust updated video-js image sprite