Zixaphir 298b5d3270 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
2013-08-16 03:39:33 -07:00
..
2013-08-16 03:39:33 -07:00
2013-08-16 00:09:40 -07:00
2013-08-16 03:39:33 -07:00
2013-08-16 00:09:40 -07:00