Bug 859166 - make es-* contribute pages work and behave as es-ES
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)
Cleaned import statements. Added labels. Bug 843789.

- Added labels to /about/partnerships/ form
Merge remote branch 'upstream/master' into bug-843789-add-spam-prevention