Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Sat, 23 Jun 2012 10:14:31 +0000 (14:14 +0400)
committerThomasV <thomasv@gitorious>
Sat, 23 Jun 2012 10:14:31 +0000 (14:14 +0400)
commit97b96b89bd67b418f8ee8b2765d97e8f8561b4f3
tree6e5e1079d8439cc7d134a5d8dc65ff410b29e6c2
parent14102909a7d1a1f2303aa64bd3ee2f494d78460b
parent1a8d97277ae18d99450b27701a7b1c170ea60da3
Merge branch 'master' of gitorious.org:electrum/electrum