Zixaphir 6c47fb300a Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Header.coffee
2013-12-06 17:20:48 -07:00
..
2013-12-06 17:20:48 -07:00
2013-11-27 17:36:31 -07:00
2013-12-06 17:20:48 -07:00
2013-11-27 17:36:31 -07:00