Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Thu, 21 Nov 2013 23:36:58 +0000 (00:36 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Thu, 21 Nov 2013 23:36:58 +0000 (00:36 +0100)
commit8bc6e5267cbe07d6ae2285c72d8d2f9b64e31432
tree14aea31bb1d619d8335dce3074a7181839b90321
parentb29dfd98ccdfe79734cbd5f4eae191e3aa7948d7
parent39e2e9b29190ce7c2b99c81b58e31c29399811d4
Merge branch 'master' of https://git.bettercrypto.org/ach-master
src/practical_settings.tex