Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Thu, 21 Nov 2013 16:58:36 +0000 (17:58 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Thu, 21 Nov 2013 16:58:36 +0000 (17:58 +0100)
commit1b22bd2aa2c7ce36491502b29f64a7b07f6d01c4
treea1563ba08bc3fc765e72c1afd8bb54aec7b2c026
parent6aaac25641fd5a0a77bf1f1e80ac6ba9e447316f
parente6b96d26f822723b153e8e7e1b6891146f5f7f00
Merge branch 'master' of https://git.bettercrypto.org/ach-master
src/practical_settings.tex