Merge branch '2.0' of git://github.com/spesmilo/electrum into 2.0
authorThomasV <thomasv@gitorious>
Wed, 29 Jan 2014 15:46:57 +0000 (16:46 +0100)
committerThomasV <thomasv@gitorious>
Wed, 29 Jan 2014 15:46:57 +0000 (16:46 +0100)
commitb14e20adfaf85af64857783e0ba2347748b3df40
tree11cc6f4d91feadb1c7b1c4e14d7709384a6c4fad
parentd15c4f10467776e1f002670310d86c0eeaca7b23
parent5b5234cfada8f65e2b505beaeb2a3fc31c3e8486
Merge branch '2.0' of git://github.com/spesmilo/electrum into 2.0