Merge branch 'master' of https://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Mon, 17 Jun 2013 21:23:22 +0000 (23:23 +0200)
committerMaran <maran.hidskes@gmail.com>
Mon, 17 Jun 2013 21:23:22 +0000 (23:23 +0200)
commitf823764dc35adfbcb80399236314ff59a6f05acb
tree306318e22485831838e487fff10eb77bc15349e7
parent4570db08040409215dbf70a1693a5dc7267145fb
parent7982860d2761c71cf9010edea347829fc4e4a994
Merge branch 'master' of https://github.com/spesmilo/electrum