Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Sun, 4 Dec 2011 11:51:17 +0000 (12:51 +0100)
committerThomasV <thomasv@gitorious>
Sun, 4 Dec 2011 11:51:17 +0000 (12:51 +0100)
commit6fda904d041855e572c7c18caa45f35ed17287b5
treeea79b19c4b184ffd1792e35c36e0c60405f69176
parent4bdc1ca60f7b89ac0d1c36ccec3bdf29f9b65191
parentd608b818394509c462e0d3adc4f458a743761631
Merge branch 'master' of gitorious.org:electrum/electrum