Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/server into...
authorThomasV <thomasv@gitorious>
Sun, 1 Apr 2012 09:31:11 +0000 (13:31 +0400)
committerThomasV <thomasv@gitorious>
Sun, 1 Apr 2012 09:31:11 +0000 (13:31 +0400)
commit66dccede5d731c1cb9372205f6936e3dbed7a275
tree68aad6595916ab2fd840e9ca925e5118ac0fbca4
parent0a4340dff7bc203648b567f60ecff7595b466405
parent0c017e18235caeb9a6303ef4221eba69db87b6b9
Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/server into merge-requests/2