Bug 903216: Some l10n pages show {OK} from *.lang files
Added in docs for vagrant install. These should have been in my other PR, but during
the rework of it I forgot to add these.
Merge pull request #1183 from bensternthal/vagrant-doc-fix

Added in docs for vagrant install. These should have been in my other PR...
Update isFirefox for Camino UA string. Bug 906700.
Merge pull request #1185 from jpetto/bug-906700-camino-is-not-firefox

Update isFirefox for Camino UA string. Bug 906700.
Bug 904703: Spanish locales fallback to es-ES for localized screenshots
Bug 905532: Use specific locales for homepage apache rule.

Backed out #1125
Merge pull request #1189 from pmclanahan/bug-905532-mpl-404

Bug 905532: Use specific locales for homepage apache rule.
Merge pull request #1188 from pmclanahan/Bug-904703_Spanishes_fallback_to_es-ES_images_for_screenshots

Bug 904703: Spanish locales fallback to es-ES for localized screenshots
Bug 907330 - Use newsletter languages instead of hard-coding
Merge pull request #1187 from dpoirier/bug-907330-use-newsletter-languages

Bug 907330 use newsletter languages
Bug 894246: Update webfont CSS
 - Cache-bust Open Sans fonts
 - drop SVN include
 - drop extra .eot
These changes are based on http://www.fontspring.com/blog/the-new-bulletproof-font-face-syntax
Merge pull request #1184 from sgarrity/bug-894246-font-cache

Bug 894246: Cache-bust Open Sans fonts for IE
Merge pull request #1143 from l-hedgehog/bug-903216-case-insensitive-ok

Bug 903216: Some l10n pages show {OK} from *.lang files
Enable /plugincheck and /new for nb-NO

Updated rewrite rule to enable plugincheck (bug 892470) and new
download page (bug 881754) for nb-NO
Merge pull request #1192 from flodolo/nb_NO

Enable /plugincheck and /new for nb-NO
Bug 901541 - newsletter recovery page

* When someone goes to the /existing page with an invalid token or no
  token, redirect them to a recovery page
* On the recovery page, they can enter their email address and we'll
  send them a message containing a valid link to manage their subscriptions.
* If the email is not known, we tell them to check for typos or go sign up.
Merge pull request #1169 from dpoirier/bug-901541-newsletter-recovery-page

Bug 901541 - newsletter recovery page
Bug-887426 migrate participation and policies pages to bedrock
Merge branch 'retornam-Bug-887426-migrate-policies'

Conflicts:
	etc/httpd/global.conf