Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Sat, 20 Apr 2013 16:21:56 +0000 (18:21 +0200)
committerecdsa <ecdsa@github>
Sat, 20 Apr 2013 16:21:56 +0000 (18:21 +0200)
commitcf432db6e858316dcc52d99b8338d15a9fdb9dcb
tree19cdc53083b063ced1423943f49b94a4af3df6e7
parentde21e2297ef687d7967111682bb1219845bb052a
parentccc651c15f1e41fbe04941d391be159b7ddb92bd
Merge branch 'master' of git://github.com/spesmilo/electrum