Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Mon, 31 Mar 2014 15:18:26 +0000 (17:18 +0200)
committerThomasV <thomasv@gitorious>
Mon, 31 Mar 2014 15:18:26 +0000 (17:18 +0200)
commitffc72e65df01bb397d51ca70ff04eb60fab9b8a2
tree31285a773d1678a6c3f1e74cc30d1dd20669b0da
parent9663600d5dd6529d19006777a97b5c9c3dd8ac12
parent607e79cc431dea7e5d8dbcf958a66ac1f6084999
Merge branch 'master' of git://github.com/spesmilo/electrum