Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Sun, 10 Mar 2013 15:26:36 +0000 (16:26 +0100)
committerecdsa <ecdsa@github>
Sun, 10 Mar 2013 15:26:36 +0000 (16:26 +0100)
commit4ea03147c305b6896f9ba27ab88fe47e40cdb0e3
tree4f022f0a4d5a82627c374c2b835ef09ad442bd6d
parent441cc6c9cdaf11ef0e65bad3133b6ae971f6888d
parent18bcf5b206664e3a9d2392ba54c349423eb9456b
Merge branch 'master' of git://github.com/spesmilo/electrum