Merge branch 'master' of github.com:spesmilo/electrum-server
authorThomasV <thomasv@gitorious>
Mon, 16 Dec 2013 19:15:09 +0000 (23:15 +0400)
committerThomasV <thomasv@gitorious>
Mon, 16 Dec 2013 19:15:09 +0000 (23:15 +0400)
commit240db7c28d2e6a0d0078c42f81b2b110615e88c6
tree98672b32d45c4b243e9c48d52dcc75bf9c8bb0ab
parent27a747403631ad45bc148b757403cdee6ffa67cb
parenteb0d8b78d79faebd4575671becd45b0864a2e589
Merge branch 'master' of github.com:spesmilo/electrum-server