From: Ovidiu Constantin <ovidiu.constantin@livigent.com>
Date: Wed, 23 Nov 2011 14:21:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=25204beba2ee0c96e7e52684ded43455dfbb81af

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

25204beba2ee0c96e7e52684ded43455dfbb81af