Zixaphir 1fdd1ee64f Merge branch 'master' into ccd0merge
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2015-01-11 20:49:25 -07:00
..
2015-01-11 20:49:25 -07:00