Zixaphir 48bdc81f01 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/css/style.css
2013-05-07 19:16:02 -07:00
..
2013-05-07 19:16:02 -07:00
2013-05-07 19:16:02 -07:00
2013-05-07 19:16:02 -07:00
2013-05-07 19:16:02 -07:00
crx
2013-05-03 12:17:04 -07:00
2013-05-03 15:16:40 -07:00