From: ThomasV <thomasv1@gmx.de>
Date: Mon, 20 Jan 2014 16:28:02 +0000 (+0100)
Subject: Merge branch 'fulltree' of github.com:spesmilo/electrum-server into fulltree
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=0d1e9d66e6bb4aae1fe41369f9fd40ab9957a722;hp=-c

Merge branch 'fulltree' of github.com:spesmilo/electrum-server into fulltree
---

0d1e9d66e6bb4aae1fe41369f9fd40ab9957a722