Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 25 Nov 2013 21:51:11 +0000 (22:51 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 25 Nov 2013 21:51:11 +0000 (22:51 +0100)
commitbfcf1c7ca7c212c36ce219d285daee581b27b9d1
tree2265ee73f551a96f4d2bc1003a6571a02572c8c8
parenta1f88a877c2878c9453c5ae3dfd1fe54a0c6e3fa
parent992b99dc7be1bdbc84d1c8a0e1e121eecfc11047
Merge branch 'master' of https://git.bettercrypto.org/ach-master
src/practical_settings.tex