Merge branch 'master' of ssh://github.com/spesmilo/electrum
authorMaran <maran.hidskes@gmail.com>
Thu, 13 Mar 2014 17:26:19 +0000 (18:26 +0100)
committerMaran <maran.hidskes@gmail.com>
Thu, 13 Mar 2014 17:26:19 +0000 (18:26 +0100)
commitf56fbb509f12a981bfac153931016185499b480c
tree59415affa403a375f2ffc6bc0753fc06a8813ed3
parentbae36d658b24bd068377247ea9a44533b5e2d7f1
parente2c749cdab2c23e42c8e86f9eb0fba12ec139df9
Merge branch 'master' of ssh://github.com/spesmilo/electrum