From: ThomasV <thomasv@gitorious>
Date: Thu, 1 Dec 2011 16:41:56 +0000 (+0300)
Subject: Merge commit 'refs/merge-requests/6' of git://gitorious.org/electrum/electrum into... 
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=fbec8794e64183e748aa42f2812bb6f237f60cdf

Merge commit 'refs/merge-requests/6' of git://gitorious.org/electrum/electrum into merge-requests/6
---

fbec8794e64183e748aa42f2812bb6f237f60cdf