Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 25 Nov 2013 20:36:37 +0000 (21:36 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 25 Nov 2013 20:36:37 +0000 (21:36 +0100)
commit296508da7835a7ed809e23c579ef26a9f58a2755
tree3f3e08f081139a9c02b8da5b4f01a8f9c997ec7d
parent449eef6f3400a4c9c3f0e79eea4bb9e234ec636d
parentf622905d77d63dc6df56e4313dae8d057cc4fe73
Merge branch 'master' of https://git.bettercrypto.org/ach-master
src/practical_settings.tex