Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Thu, 10 May 2012 09:10:51 +0000 (13:10 +0400)
committerThomasV <thomasv@gitorious>
Thu, 10 May 2012 09:10:51 +0000 (13:10 +0400)
commitca15ae68910c72bdb4deaf9645a16d4fbc459133
tree5a6b8c9327fbf45f450314e6dd4d342d3e0b300f
parent28427f0cfe20567606e1beb6b9c7110620bfaa7c
parent385391a045a645d9e6b32fc0e443add2b4ad1778
Merge branch 'master' of gitorious.org:electrum/electrum