Merge branch 'master' of github.com:spesmilo/electrum
authorthomasv <thomasv@gitorious>
Fri, 22 Feb 2013 13:26:22 +0000 (14:26 +0100)
committerthomasv <thomasv@gitorious>
Fri, 22 Feb 2013 13:26:22 +0000 (14:26 +0100)
commit8a8aeb456780c016e876526128be1adf7676db9a
tree48b73c604733aa74feb5b7a7541d01134ab963f5
parenta1a5886e57d7e72ed2163a9835fda4629c2eaf86
parent95f23ec1ea57cf8973c21b72bfcc77ae4d114e78
Merge branch 'master' of github.com:spesmilo/electrum
electrum