Merge branch 'fix-offline-restore' into merged
authorbkkcoins <chrissavery@gmail.com>
Fri, 21 Sep 2012 06:03:13 +0000 (13:03 +0700)
committerbkkcoins <chrissavery@gmail.com>
Fri, 21 Sep 2012 06:03:13 +0000 (13:03 +0700)
1  2 
electrum

diff --cc electrum
Simple merge