Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Wed, 30 Jan 2013 19:41:14 +0000 (23:41 +0400)
committerThomasV <thomasv@gitorious>
Wed, 30 Jan 2013 19:41:14 +0000 (23:41 +0400)
commitf764f03046e003ca032588a025dc58a2fa180587
treee9a94ba89994d7e46439c31fca101913a34d6126
parent9946c27d674e797b448c95f79e3050de50305818
parentf164245c219ccfb3253413b20f4e04bbb53b1bc7
Merge branch 'master' of github.com:spesmilo/electrum-server