Merge branch 'master' of https://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Sun, 9 Dec 2012 11:58:54 +0000 (12:58 +0100)
committerMaran <maran.hidskes@gmail.com>
Sun, 9 Dec 2012 11:58:54 +0000 (12:58 +0100)
commitf5d48ccb284d648590b623c9800b56856777c9ee
treed98bd167cff10fb91962b89616235f25615d7079
parentebfe6346e72d959dbfc3b8934fbdb95e5f0ddb3e
parent14a1a30b565c2e703a7b2360d20fa5e64cb33796
Merge branch 'master' of https://github.com/spesmilo/electrum