Set lower limit when shrinking footer. Fixes #3426.
show the client time in the error.ejs dialog
slightly delay shutdown of run_locally.js daemons to avoid shutdown races
fix a couple of jshint nits while I'm here (not all)
upgrade to awsbox 0.4.5
use toUTCString
document changes in train-2013.06.05
bump version in dev after branching train-2013.06.05
Merge pull request #3493 from jrgm/show_client_time_in_error_dialog

Show client time in error dialog
Merge pull request #3483 from mozilla/awsbox-upgrade

Awsbox upgrade
Merge pull request #3450 from 6a68/issue_3426_fix_footer_shrink

Set lower limit when shrinking footer. Fixes #3426.
Merge pull request #3480 from jrgm/issue3465-start-stop-chill

slightly delay shutdown of run_locally.js daemons to avoid shutdown races
Catch, log, and throw client errors
Merge pull request #3504 from mozilla/3374-log-errors

Catch, log, and throw client errors
Add a test RP to test navigator.id.get

fixes #3507
ToS: clarify that use in education and government is generally ok

This update to the terms of service comes from Jishnu Menon.
Merge pull request #3509 from fmarier/updated_tos

ToS: clarify that use in education and government is generally ok

r+
Address @callahad's great suggestions:

* Remove maximum-scale from the meta viewport declaration in the head
* Remove forceIssuer and allowUnverified in the call to process_assertion
Merge pull request #3508 from mozilla/issue_3507_get_rp

Add a test RP to test navigator.id.get

Dan gave the r+, merging.
Merge branch 'dev' of github.com:mozilla/browserid into issue_3496-tooltips-off-screen