Fix urlencoding in share links (Bug 796049)
Merge pull request #613 from sgarrity/bug-796049-video-slideshow

Fix urlencoding in share links (Bug 796049)
Bug 836827 - Implement Firefox Flicks Tabzilla promo
Merge pull request #615 from sgarrity/bug-836827-flicks-tabzilla

Bug 836827 - Implement Firefox Flicks Tabzilla promo
Merge branch 'master' of git://github.com/mozilla/bedrock