Merge branch 'fulltree' of github.com:spesmilo/electrum-server into fulltree
authorThomasV <thomasv1@gmx.de>
Mon, 20 Jan 2014 16:28:02 +0000 (17:28 +0100)
committerThomasV <thomasv1@gmx.de>
Mon, 20 Jan 2014 16:28:02 +0000 (17:28 +0100)

Trivial merge