Fix Bug 926243 - Adjust font size for localized Firefox OS promo on Tabzilla
Fix Bug 966409 - Use the real Firefox wordmark on the home page
Fix bug 964878 - Update 'Get a Phone' CTA for Chile
Merge pull request #37 from mozilla/bug-964878-update-cta-for-chile

Fix bug 964878 - Update 'Get a Phone' CTA for Chile
Merge branch 'master' of github.com:mozilla/bedrock
Add register link to MWC schedule modal. Bug 969102.
Merge pull request #1712 from jpetto/bug-969102-add-register-link-to-mwc-schedule

Add register link to MWC schedule modal. Bug 969102.
Add site-wide MWC badge. Bug 958287.
[bug 974467] Update mwc fox den calendar wednesday feb 19
Merge pull request #1715 from alexgibson/bug-974467-update-mwc-fox-den-calendar

[bug 974467] Update mwc fox den calendar wednesday feb 19
[bug 974467] update mwc fox den calendar remove desc
Merge pull request #1654 from kyoshino/bug-966409-home-fx-wordmark

Fix Bug 966409 - Use the real Firefox wordmark on the home page
Merge pull request #1708 from kyoshino/bug-926243-tabzilla-promo-font-size

Fix Bug 926243 - Adjust font size for localized Firefox OS promo on Tabzilla
Add MWC home & tabzilla promos. Bug 958294.
Bug 970870 :  Restrict Tabzilla MWC promo to MWC locales
* Tabzilla promo activated via a promo_mwc_2014 tag in tabzilla.lang
* Locales without the promo get the current Firefox OS promo (which is widely localized)
* Promo strings extracted from mwc2014_promos.lang for both the tabzilla promo and the home page tile, to restrict localization to 16 selected locales
Merge pull request #1681 from mozilla/bug-958294-mwc-home-tile-tabzilla-promo

Add MWC home & tabzilla promos. Bug 958294.
Bug 973657: css fixes for localized tabzilla promos for MWC

Conflicts:
	media/css/tabzilla/tabzilla.less
Merge pull request #1720 from mozilla/bug-973657-mwc-tabzilla-locale-fixes

Bug 973657: css fixes for localized tabzilla promos for MWC
Merge pull request #1714 from jpetto/bug-958287-add-mwc-badge

Add site-wide MWC badge. Bug 958287.