Skip to content
Snippets Groups Projects
Commit 346a110b authored by Lloyd Hilaiel's avatar Lloyd Hilaiel
Browse files

Merge changes on 'train-2012.07.30' into dev 

Conflicts:
	.gitignore
	ChangeLog
	lib/email.js
	package.json
	scripts/browserid.spec
parents 577d440a 5cfd2d99
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment