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-08 15:49:00 -07:00
2013-08-08 15:49:00 -07:00
2013-08-15 23:41:50 -07:00
2013-05-05 17:31:40 -07:00
2013-08-08 15:49:00 -07:00
2013-06-21 00:11:10 -07:00