Bug 852589: Add dev-only page to display all download buttons.
Bug 856081 redirecting /about/drivers to the wiki
Bug 795033: Add Besnik email as contact point for fy-NL contribute page, activate MOZ15 flag
Bug 795033: Add Serbian email contact for contribute page
Bug 859166 - make es-* contribute pages work and behave as es-ES
Bug 797192: Add apache passthrough for plugincheck.

en-US only so far.
Bug 859887 Updating Openphoto link
Merge pull request #761 from retornam/bug-859887-update-openphoto

Bug 859887 Updating Openphoto link
Bug 859282 : add Greek (el) as a locale participating in 15 years of Mozilla
moved close and share string to #strings
Bug 858657 Powered by header broken in IE7
Merge pull request #760 from retornam/bug-858657-powered-by

Bug 858657 Powered by header broken in IE8 ,IE7 and IE6
Bug 857199: Add ability to force a button to point to stub.

Adds force_stub_installer keyword arg to button helper
that will change the download product to use the firefox-*-stub
product for en-US Windows download buttons.
Merge pull request #764 from pmclanahan/bug-857199-beta-stub-installer

Bug 857199: Add ability to force a button to point to stub.
Merge pull request #763 from pascalchevrel/bug-859282_greek_15years_campaign

Bug 859282 : add Greek (el) as a locale participating in 15 years of Moz...
Merge PR #756 branch 'pascalchevrel/bug-859166_Spanishes_and_contribute_page'

Conflicts:
	settings/base.py
Merge pull request #748 from icaaq/move-to-strings

Move share and close strings to data-attribute on #strings
Bug 859312 Change radius to diameter in styleguide
(image updates from sgarrity)
Bug 849426: Port /about/history.html to bedrock

- new pages created on wiki with old content of some pages:
  - www.mozilla.org/about/bookmarks.html ->
           https://wiki.mozilla.org/Historical_Documents
  - www.mozilla.org/about/timeline.html ->
           https://wiki.mozilla.org/Timeline
- new /about/history/ page on bedrock with existing content from
  old /about/history.html, and links to new wiki pages
- added rewrite rules so new history page is served from bedrock and old
  bookmarks and timeline pages redirect to the new wiki pages
- used about-base.html template for history page
- Added some more information to the install doc about getting the PHP
  and Bedrock sides of the site running locally with Apache.
- Make about.less import about-base.less and then add mosaic to it,
  so it's clear that the only difference is the mosaic.
Merge pull request #714 from dpoirier/bug-849426-about-history

Bug 849426 - port  mozilla.org/about/history.html to bedrock