Zixaphir 6dcbb80070 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
2014-04-04 16:01:06 -07:00
..
2014-04-04 16:01:06 -07:00
2014-03-01 18:53:03 +01:00
2014-04-04 13:37:08 -07:00
2014-04-04 16:01:06 -07:00
2014-04-04 16:01:06 -07:00
2014-04-03 16:56:49 -07:00
2014-04-04 13:37:08 -07:00