Zixaphir ae9b197d3f Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/General/Settings.coffee
2013-08-05 14:38:52 -07:00
..
2013-08-05 14:38:52 -07:00