5 commits

Author	SHA1	Message	Date
Franko	77b280115b	cleanup rebase 1.4.6	2016-06-14 19:19:09 -04:00
Christopher Franko	e959453cda	Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4	2016-06-14 18:14:19 -04:00
Felix Lange	c046126c87	[release/1.4.6] internal/jsre: ensure Stop can be called more than once ... This makes "geth js file.js" terminate again. (cherry picked from commit fdba0cb03c)	2016-06-06 16:21:53 +03:00
Péter Szilágyi	7c90a2e42e	[release/1.4.6] console, internal/jsre: colorize JavaScript exceptions too ... (cherry picked from commit 14ae5708d6)	2016-06-06 16:21:44 +03:00
Péter Szilágyi	c39de61a0a	[release/1.4.6] cmd, console: split off the console into a reusable package ... (cherry picked from commit ffaf58f0a9)	2016-06-06 16:21:41 +03:00