Zixaphir b7d6fa2659 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
2013-12-16 14:05:03 -07:00
..
2013-12-16 14:05:03 -07:00
2013-12-06 17:31:20 -07:00
2013-12-16 14:05:03 -07:00
2013-12-06 17:31:20 -07:00