3 commits

Author	SHA1	Message	Date
thomasv	1a781036cf	move init_socket in constructor	2012-10-12 16:09:20 +02:00
thomasv	5444f55e6b	big refactoring: command line options and electrum.conf options override settings in wallet file.	2012-10-11 20:10:12 +02:00
thomasv	6bf18d8607	add merchant script	2012-10-08 15:19:29 +02:00