Zixaphir 99a6565ca9 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Monitoring/Favicon.coffee
2014-01-12 19:46:28 -07:00
..
2014-01-12 19:46:28 -07:00
2014-01-11 21:33:45 -07:00
2014-01-12 19:46:28 -07:00
2014-01-11 21:33:45 -07:00