gistfile1.txt

# On branch b2g-merge
# Changes to be committed:
#
#  modified:   .awsbox.json
#	new file:   config/b2g.json
#	modified:   config/local.json
#	modified:   example/rp/index.html
#	new file:   lib/boolean-query.js
#	modified:   lib/configuration.js
#	modified:   lib/db.js
#	new file:   lib/db/dbutils.js
#	modified:   lib/db/json.js
#	modified:   lib/keysigner/ca.js
#	modified:   lib/keysigner/keysigner-compute.js
#	modified:   lib/static_resources.js
#	modified:   lib/validate.js
#	modified:   lib/verifier/certassertion.js
#	modified:   lib/verifier/verifier-compute.js
#	modified:   lib/wsapi/address_info.js
#	modified:   lib/wsapi/authenticate_user.js
#	modified:   lib/wsapi/cert_key.js
#	modified:   resources/static/common/js/storage.js
#	modified:   resources/static/common/js/xhr.js
#	modified:   resources/static/dialog/css/m.css
#	new file:   resources/static/dialog/i/firefox-accounts-logo.png
#	modified:   resources/static/dialog/js/misc/helpers.js
#	modified:   resources/static/dialog/js/misc/internal_api.js
#	modified:   resources/static/dialog/js/modules/dialog.js
#	modified:   resources/static/dialog/js/modules/generate_assertion.js
#	modified:   resources/static/dialog/js/modules/pick_email.js
#	modified:   resources/static/dialog/js/modules/provision_primary_user.js
#	modified:   resources/static/dialog/js/modules/required_email.js
#	modified:   resources/static/dialog/js/modules/verify_primary_user.js
#	modified:   resources/static/pages/js/forgot.js
#	modified:   resources/static/pages/js/signin.js
#	modified:   resources/static/pages/js/verify_secondary_address.js
#	modified:   resources/static/test/cases/dialog/js/misc/helpers.js
#	modified:   resources/static/test/cases/dialog/js/misc/state.js
#	modified:   resources/static/test/cases/dialog/js/modules/authenticate.js
#	modified:   scripts/serve_example.js
#	modified:   tests/account-cancel-test.js
#	modified:   tests/address-info-test.js
#	modified:   tests/ca-test.js
#	modified:   tests/cache-header-tests.js
#	new file:   tests/unverified-email-test.js
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      bin/keysigner
#	both modified:      bin/verifier
#	both modified:      lib/db/mysql.js
#	both modified:      lib/static/views.js
#	both modified:      lib/wsapi.js
#	both modified:      lib/wsapi/stage_user.js
#	both modified:      resources/static/common/js/network.js
#	both modified:      resources/static/common/js/user.js
#	both modified:      resources/static/dialog/css/style.css
#	both modified:      resources/static/dialog/js/misc/state.js
#	both modified:      resources/static/dialog/js/modules/actions.js
#	both modified:      resources/static/dialog/js/modules/authenticate.js
#	both modified:      resources/static/dialog/js/modules/set_password.js
#	both modified:      resources/static/dialog/views/set_password.ejs
#	both modified:      resources/static/include_js/_jschannel.js
#	both modified:      resources/static/test/cases/common/js/network.js
#	both modified:      resources/static/test/cases/common/js/user.js
#	both modified:      resources/static/test/mocks/xhr.js