Merge branch 'master' of git://github.com/spesmilo/electrum

This commit is contained in:
ThomasV 2013-10-04 17:55:01 +02:00
commit 43002f2ede
1 changed files with 1 additions and 1 deletions

View File

@ -18,7 +18,7 @@
import re import re
import pkgutil import pkgutil
import sys, os, time, json import sys, os, time, json, readline
import optparse import optparse
import platform import platform
from decimal import Decimal from decimal import Decimal