Zixaphir 4410a8f118 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
2013-08-06 16:03:07 -07:00
..
2013-05-08 06:24:19 -07:00
2013-08-06 16:03:07 -07:00
2013-05-25 23:39:50 -07:00
2013-07-21 09:01:27 -07:00