Fix merge conflict with master
authorMaran <maran.hidskes@gmail.com>
Wed, 29 Aug 2012 20:54:44 +0000 (22:54 +0200)
committerMaran <maran.hidskes@gmail.com>
Wed, 29 Aug 2012 20:54:44 +0000 (22:54 +0200)
commit23d314462fa8ecdc5dd3dcf63490f57575194a6b
treeb401a0a64bbe5fc62614f92584d3823631522509
parentf540adaf2ab5623380ea0c8c3686a1d4ba98db95
parent9c122c23eaaba712016a7d233ee0cdb35bb6f689
Fix merge conflict with master
electrum