Merge branch 'master' of https://git.bettercrypto.org/ach-master into theory-rewrite
authorAaron Kaplan <aaron@lo-res.org>
Mon, 23 Dec 2013 20:28:29 +0000 (21:28 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 23 Dec 2013 20:28:29 +0000 (21:28 +0100)
Conflicts:
src/RNGs.tex


Trivial merge