Merge branch 'master' of ssh://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Mon, 30 Sep 2013 14:21:36 +0000 (16:21 +0200)
committerMaran <maran.hidskes@gmail.com>
Mon, 30 Sep 2013 14:21:36 +0000 (16:21 +0200)
commit2c582ff28a8c82ecfd1f84c1c0e099421bcf769c
tree5a089ddf04d1303806c8ae590c8e48e80f9af002
parent25120ddaf343f5966ac054b1c3029ed3534466d6
parent547b6d1d55a80bd7a8a45cc0c7b4e85243490da1
Merge branch 'master' of ssh://github.com/spesmilo/electrum