From: ThomasV <thomasv@gitorious>
Date: Sat, 26 Nov 2011 15:08:46 +0000 (+0300)
Subject: Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/electrum into... 
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=b86482dd26a79491bd562693c78c6b9950f2ccba

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

b86482dd26a79491bd562693c78c6b9950f2ccba