From: Eagle[TM] <eagletm@mpex.net>
Date: Mon, 26 Nov 2012 22:20:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=1632e584f85a94439d8a4f868e4316fcc4ee11f3;hp=4ba89c7c7f2ede820ebe99dfa459cc3180ed9b72

Merge remote-tracking branch 'upstream/master'
---