Merge branch 'master' of git://github.com/spesmilo/electrum
authorthomasv <thomasv@gitorious>
Mon, 7 Oct 2013 17:24:26 +0000 (19:24 +0200)
committerthomasv <thomasv@gitorious>
Mon, 7 Oct 2013 17:24:26 +0000 (19:24 +0200)
commit29848e64a2c6d86c0ac0ac73d4cd3c1b4a07e254
tree613d5e495f67d1eafd5a330a1a3451fa99ac32c1
parentca75d3c08a2dd358967eacbacbfbb89ac3d504f9
parent37e7759206f8b802734e0b62fbef0c466d26f4d1
Merge branch 'master' of git://github.com/spesmilo/electrum