Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9
authorthomasv <thomasv@gitorious>
Fri, 30 Aug 2013 08:26:53 +0000 (10:26 +0200)
committerthomasv <thomasv@gitorious>
Fri, 30 Aug 2013 08:26:53 +0000 (10:26 +0200)
commitcde1d0f6c07c9c340dcd89c937e8c3c0c2526c8d
tree56be32f98df0e14729430fca70c01e2fc2f8a73b
parent853d32b73d4b829330974146cd2d3caad5e8d04c
parent16371974195fb068455f40f56d983ddf271dc850
Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9