Merge branch 'master' of github.com:spesmilo/electrum
authorthomasv <thomasv@gitorious>
Wed, 20 Mar 2013 12:58:20 +0000 (13:58 +0100)
committerthomasv <thomasv@gitorious>
Wed, 20 Mar 2013 12:58:20 +0000 (13:58 +0100)
commit1c98b28e45a580a8d0b8c40e0ec38f8c50c00a56
tree613d14df8ba380f039f27da8af698f61049e340b
parentb487fc072c842412ddce0371140abd4f177d14bc
parentdebf2dfeb5392a5ca1782efb5f90f9387125cfac
Merge branch 'master' of github.com:spesmilo/electrum