Merge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/server into...
authorAmir Taaki <genjix@riseup.net>
Fri, 17 Aug 2012 19:53:45 +0000 (20:53 +0100)
committerAmir Taaki <genjix@riseup.net>
Fri, 17 Aug 2012 19:53:45 +0000 (20:53 +0100)

Trivial merge