Merge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/electrum into...
authorThomasV <thomasv@gitorious>
Sat, 26 Nov 2011 20:47:28 +0000 (23:47 +0300)
committerThomasV <thomasv@gitorious>
Sat, 26 Nov 2011 20:47:28 +0000 (23:47 +0300)
commitf590f3f20813f341e162515e06bc43c90ce3bd94
tree08c41d0565ba81cb2af275297b9da41a17c8cc80
parentb86482dd26a79491bd562693c78c6b9950f2ccba
parentae2365b10eb1aee42e1cf4c685e931d8f159c5f8
Merge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/electrum into merge-requests/3