Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Mon, 4 Nov 2013 11:43:02 +0000 (12:43 +0100)
committerThomasV <thomasv@gitorious>
Mon, 4 Nov 2013 11:43:02 +0000 (12:43 +0100)
commit9c016a94e27f0849785b725acedb898ed1d24b23
tree113ef7edc05c6e25aa6ae80c860024538883f795
parent6197b8b8dc334f8301f40c19a61b5195df27e5ab
parentb66dbabac14230fb5bb4f4cc97444b6b6827a51f
Merge branch 'master' of git://github.com/spesmilo/electrum