Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Sun, 17 Mar 2013 18:09:06 +0000 (19:09 +0100)
committerecdsa <ecdsa@github>
Sun, 17 Mar 2013 18:09:06 +0000 (19:09 +0100)
commit87b94b3ccc4180a84e1f309ead65abd37eae3a9f
tree627401d932668ea610a8bc2cf958ca267bca4128
parent8889c524b556bd3903b6d90f99e9172974f3e20b
parent568cc776f871a5202579fd93798f1ed2635eae8a
Merge branch 'master' of git://github.com/spesmilo/electrum