Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Sat, 16 Mar 2013 20:22:15 +0000 (21:22 +0100)
committerecdsa <ecdsa@github>
Sat, 16 Mar 2013 20:22:15 +0000 (21:22 +0100)
commitc5e65ab77e322df4871af65c905c558fe892b2a1
treef1a0832d14e5514114bc63c93884741a99953a15
parent8a74be39de7e0aeaf50fd0d4ade9cdef4c51b711
parent070d497afbee28b237d2051381b18d264697ca14
Merge branch 'master' of git://github.com/spesmilo/electrum