Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Tue, 12 Nov 2013 21:47:55 +0000 (22:47 +0100)
committerThomasV <thomasv@gitorious>
Tue, 12 Nov 2013 21:47:55 +0000 (22:47 +0100)
commit0a9ca37099a87bb93c7eb2815c62c8bee1123329
treea1fb383b3b832c17599bbaf506e56f96d6ecdcd3
parente4052a38525e76c4802de67320360b6e9d4e7540
parentf36343c288b2f065472e9cce452037027559e774
Merge branch 'master' of git://github.com/spesmilo/electrum
lib/version.py