Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Fri, 22 Nov 2013 18:56:22 +0000 (19:56 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Fri, 22 Nov 2013 18:56:22 +0000 (19:56 +0100)
commit3170e1be743b56337355786442c3c98e322389af
tree2f2aa0c562bb98cf0a00fe7cb12615bc317fbafd
parentca89ec03e49c5e0a56de3c54fe57e9d2de622c87
parentffacd174b77b8411676e4fcdc21bb1e2dd67a12d
Merge branch 'master' of https://git.bettercrypto.org/ach-master
src/practical_settings.tex