Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Thu, 3 Oct 2013 05:27:51 +0000 (07:27 +0200)
committerThomasV <thomasv@gitorious>
Thu, 3 Oct 2013 05:27:51 +0000 (07:27 +0200)
commitc8328ee5fcf783dec496532f3a87b07c5ce15aac
tree63c017c98493468110d0b92a01064d59114c71d3
parent3000762eac226be289bac3ef1b5ba71570d008c0
parent47fdc6823501f256aeabe38a4703f5d38e9c0149
Merge branch 'master' of git://github.com/spesmilo/electrum