fix bug when timestamp is None
Merge branch 'master' of git://github.com/spesmilo/electrum