Merge branch 'master' of gitorious.org:electrum/server
authorThomasV <thomasv@gitorious>
Mon, 26 Mar 2012 09:42:36 +0000 (13:42 +0400)
committerThomasV <thomasv@gitorious>
Mon, 26 Mar 2012 09:42:36 +0000 (13:42 +0400)
commitef68127071a0e18be0e0b0ead379880296e8a216
tree8b4fd924150e44d702ebf6cf525089d882d72820
parent4792b79d87e45deee06c806f390fbfbed9c95da5
parente59ccabcdf7cbac04bd78f9a6030a82376044152
Merge branch 'master' of gitorious.org:electrum/server