Zixaphir 73ea806592 Merge branch 'v3'
Conflicts:
	Gruntfile.coffee
	LICENSE
	builds/crx/script.js
2013-08-10 14:41:26 -07:00
..
2013-08-10 14:41:26 -07:00