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

Trivial merge