Merge branch 'master' of https://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Sun, 17 Mar 2013 12:15:47 +0000 (13:15 +0100)
committerMaran <maran.hidskes@gmail.com>
Sun, 17 Mar 2013 12:15:47 +0000 (13:15 +0100)
commit6a45fb831898671dbe517fe45fd6d390287d1bf6
tree465fceee7b4a31398f98f9344a2d3dcc5e1e4d40
parent555beebf9b6acbafeae6336f7446b87ca4f934c5
parent117ff7af9f895e41620817e020be19a3f9d19738
Merge branch 'master' of https://github.com/spesmilo/electrum