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-08-08 15:49:00 -07:00
2013-06-06 07:19:46 -07:00
2013-08-12 19:22:37 -07:00
2013-08-12 19:22:37 -07:00
2013-08-12 19:22:37 -07:00
2013-08-12 19:22:37 -07:00
2013-06-20 21:06:33 -07:00
2013-06-21 00:11:10 -07:00
2013-06-21 00:11:10 -07:00
2013-04-28 21:20:22 -07:00
2013-08-12 19:22:37 -07:00
2013-08-12 19:22:37 -07:00
2013-08-09 20:33:42 -07:00