Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Mon, 5 Dec 2011 13:50:58 +0000 (16:50 +0300)
committerThomasV <thomasv@gitorious>
Mon, 5 Dec 2011 13:50:58 +0000 (16:50 +0300)
commitfdc08e700c032567eef0b4965c9e60e94583506a
treeff105f23c54bf2393a0394034fbb22b11553c0a0
parentf441ec722be08338e3e36293a4bcb7bef4264915
parent4843c4dd3a8b87ac8598fb698fd9a4adf4c36302
Merge branch 'master' of gitorious.org:electrum/electrum