Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Mon, 14 Nov 2011 22:06:40 +0000 (23:06 +0100)
committerThomasV <thomasv@gitorious>
Mon, 14 Nov 2011 22:06:40 +0000 (23:06 +0100)
commit899f4e8c99a21b0fa0336f9405f44d49396c234e
tree7f89bb861e03c4d0f22d5ffac45b7f5b38386cf6
parent0e0b40921abfe1fd4aa83a00ad4a08a57eac1a0c
parent0c814f48837d30db81a1b39dbb3ab99493d6f212
Merge branch 'master' of gitorious.org:electrum/electrum