Merge branch 'fulltree' of github.com:spesmilo/electrum-server into fulltree
authorThomasV <thomasv1@gmx.de>
Wed, 19 Feb 2014 12:07:10 +0000 (13:07 +0100)
committerThomasV <thomasv1@gmx.de>
Wed, 19 Feb 2014 12:07:10 +0000 (13:07 +0100)

Trivial merge