Merge branch 'master' of github.com:Spesmilo/Electrum
authorAmir Taaki <genjix@riseup.net>
Fri, 3 Aug 2012 19:13:49 +0000 (16:13 -0300)
committerAmir Taaki <genjix@riseup.net>
Fri, 3 Aug 2012 19:13:49 +0000 (16:13 -0300)
commitda5571a8703a505db49158003de7689a19400554
tree9844a00ceba17316db25294c641dbadf106aeeba
parent99f71a188f1bef31d8c5c54e95ede612e61a9bbd
parent2791ecc167b5f5ba94b7a56cf155f2217d2f8309
Merge branch 'master' of github.com:Spesmilo/Electrum