Zixaphir 6c2c9b281a Merge branch 'v3'
Conflicts:
	builds/crx/script.js
	src/General/Config.coffee
	src/General/Settings.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/ThreadWatcher.coffee
2013-08-12 19:22:37 -07:00
..
2013-04-14 15:36:26 -07:00
2013-04-14 15:36:26 -07:00
2013-04-14 15:36:26 -07:00
2013-08-12 00:37:42 -07:00
2013-08-12 19:22:37 -07:00