Merge branch 'master' of github.com:spesmilo/electrum
authorthomasv <thomasv@gitorious>
Thu, 20 Dec 2012 13:39:40 +0000 (14:39 +0100)
committerthomasv <thomasv@gitorious>
Thu, 20 Dec 2012 13:39:40 +0000 (14:39 +0100)
commit3a6734385c40bf8cd1550bec0cbebb029db299c8
tree5c94f988ae38110c5b161fe91e698259e4963f51
parent9f4797c870a4fba6423342bb213e4c79fabe1707
parent6c8bb596a40c7bbec24dfb10199aa694be116a09
Merge branch 'master' of github.com:spesmilo/electrum