Merge branch 'master' of https://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Fri, 15 Mar 2013 15:52:57 +0000 (16:52 +0100)
committerMaran <maran.hidskes@gmail.com>
Fri, 15 Mar 2013 15:52:57 +0000 (16:52 +0100)
commit229cfb27bbf56c16ed3a5545e1086dbea937db77
treefc894ff70ea25d6bd3bc21f7b37681705b9d394b
parent76f045f61641c3e01516eb40d6226db22cecc316
parent93b98e117654866024a8b850e3a4efc0bfd007d3
Merge branch 'master' of https://github.com/spesmilo/electrum