Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Sat, 23 Nov 2013 15:44:57 +0000 (16:44 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Sat, 23 Nov 2013 15:44:57 +0000 (16:44 +0100)
commite8ad1e40ad0656d756a8ee00189769f2d17e82f2
tree295856ff4a0566aa4a45c9f29fb778816cc4d1f9
parent2f04380bf93d327a70cc116e68e3792eee678558
parent0f7b7ae29dcf92aae760418170957f6597cf269b
Merge branch 'master' of https://git.bettercrypto.org/ach-master
src/practical_settings.tex