Bug 904237  Update persona.html and persona.less
Copy changes to focus on sign-in-with-email behavior of Persona
Made relying party example block generic, named it rp-example (from previous RP used trovebox)
Add poster frame attribute to video() helper
Bug 905347
Use video() helper for videos across bedrock
Bug 905348
Bug 904765 - update Flicks promo on home page
Bug 903216: Some l10n pages show {OK} from *.lang files
Merge pull request #1167 from craigcook/bug-904765-flicks-home-promo

Bug 904765 - update Flicks promo on home page
Merge pull request #1160 from sgarrity/persona-updates

Bug 904237 Update persona.html and persona.less
Bug 896147: migrate geolocation demo to google maps api v3
Remove mutable default argument from platform_img

See http://effbot.org/zone/default-values.htm for decent explanation of
why this is bad.

Also added tests.
Merge pull request #1173 from jgmize/remove-mutable-default-arg-platform_img

Remove mutable default argument from platform_img
Merge pull request #1166 from sgarrity/bug-905348-video

Add poster frame attribute to video() helper and use the video() helper across bedrock
Fix typo in fx/performance screencast ogv video URL.
Merge pull request #1172 from pmclanahan/redirect-index-html-bug-832348

Bug 832348: Redirect all default documents (index.html) to the folder.
[bug 903192] IE popup blocker prevents users from downloading Firefox
Bug 892470 - enable plugincheck for pt-PT, rm, tr

Note: don't close the bug when merged, it's used to track activations
for all locales.
Merge pull request #1174 from flodolo/plugincheck_trpt

Bug 892470 - enable plugincheck for pt-PT, rm, tr
Wrap strings for l10n on mozilla.org/persona pages
Bug 905697
Merge pull request #1177 from sgarrity/bug-905697-persona-l10n

Wrap strings for l10n on mozilla.org/persona pages
Bug 736934 - Figure out way to set single aurora, beta, release, esr versions in single place for .htaccess

Making `.htaccess` maintenance free.
Merge pull request #1004 from kyoshino/bug-736934-redirector

Bug 736934 - Figure out way to set single aurora, beta, release, esr versions in single place for .htaccess