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)
commitb798a0fc23b193478ee6bd4b4e223b5cfeba8845
tree4d22d1bcedca3650d22fbcc2dee0b2e8054b7c24
parentd659a2f2020b052c8c33f4903091f2d0e64398f2
parentd5488e065591e1b310a2b1d475f9ea94c93428e8
Merge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/server into merge-requests/3